Merge "Fixed netconf monitoring."

diff --combined opendaylight/distribution/opendaylight/pom.xml
index e519a04a57ccebfa3ee935c8c549a2f7a96491d7,429604804978b1e8cd9e1f36d4627e2b761b656f..35e160e8274e9fe5ee09bc49ce90f77841218425
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -223,21 -223,11 +223,21 @@@
            <artifactId>config-persister-file-adapter</artifactId>
            <version>${config.version}</version>
          </dependency>
 -          <dependency>
 -              <groupId>org.opendaylight.controller</groupId>
 -              <artifactId>config-persister-directory-adapter</artifactId>
 -              <version>${config.version}</version>
 -          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-file-xml-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>config-persister-directory-xml-adapter</artifactId>
 +          <version>${config.version}</version>
 +        </dependency>
  
         <!-- Netconf -->
          <dependency>
@@@ -285,6 -275,11 +285,11 @@@
            <artifactId>ietf-netconf-monitoring</artifactId>
            <version>${netconf.version}</version>
          </dependency>
+         <dependency>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>ietf-netconf-monitoring-extension</artifactId>
+           <version>${netconf.version}</version>
+         </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>config-persister-impl</artifactId>
@@@ -471,6 -466,7 +476,6 @@@
        </dependencies>
      </profile>
      <profile>
 -      <!-- sanitytests are only enabled with this profile -->
        <id>integrationtests</id>
        <activation>
          <activeByDefault>false</activeByDefault>
@@@ -479,57 -475,41 +484,57 @@@
          <plugins>
            <plugin>
              <groupId>org.apache.maven.plugins</groupId>
 -            <artifactId>maven-invoker-plugin</artifactId>
 -            <version>1.5</version>
 +            <artifactId>maven-dependency-plugin</artifactId>
 +            <version>2.8</version>
 +            <executions>
 +              <execution>
 +                <id>copy</id>
 +                <phase>package</phase>
 +                <goals>
 +                  <goal>copy</goal>
 +                </goals>
 +              </execution>
 +            </executions>
              <configuration>
 -              <debug>false</debug>
 -              <projectsDirectory>../sanitytest</projectsDirectory>
 -              <pomIncludes>
 -                <pomInclude>pom.xml</pomInclude>
 -              </pomIncludes>
 -              <streamLogs>true</streamLogs>
 -              <noLog>true</noLog>
 -              <goals>
 -                <goal>clean</goal>
 -                <goal>verify</goal>
 -              </goals>
 -              </configuration>
 -              <executions>
 -                <execution>
 -                  <id>integration-test</id>
 -                    <goals>
 -                      <goal>install</goal>
 -                      <goal>run</goal>
 -                    </goals>
 -                </execution>
 -              </executions>
 -           </plugin>
 +              <artifactItems>
 +                <artifactItem>
 +                  <groupId>org.opendaylight.controller</groupId>
 +                  <artifactId>sanitytest</artifactId>
 +                  <version>${controller.version}</version>
 +                  <type>jar</type>
 +                </artifactItem>
 +              </artifactItems>
 +            </configuration>
 +          </plugin>
 +          <plugin>
 +            <groupId>org.codehaus.mojo</groupId>
 +            <artifactId>exec-maven-plugin</artifactId>
 +            <version>1.2.1</version>
 +            <executions>
 +              <execution>
 +                <id>sanity-test</id>
 +                <phase>package</phase>
 +                <goals>
 +                  <goal>exec</goal>
 +                </goals>
 +              </execution>
 +            </executions>
 +            <configuration>
 +              <executable>${java.home}/bin/java</executable>
 +              <arguments>
 +                <argument>-cp</argument>
 +                <argument>./target/dependency/*</argument>
 +                <argument>org.opendaylight.controller.distribution.Sanity</argument>
 +              </arguments>
 +              <environmentVariables>
 +                <JAVA_HOME>
 +                  ${java.home}
 +                </JAVA_HOME>
 +              </environmentVariables>
 +            </configuration>
 +          </plugin>
          </plugins>
        </build>
 -
 -      <dependencies>
 -        <dependency>
 -         <groupId>org.opendaylight.controller</groupId>
 -         <artifactId>controller-maven-plugin</artifactId>
 -         <version>0.1.0-SNAPSHOT</version>
 -        </dependency>
 -      </dependencies>
      </profile>
    </profiles>
  
@@@ -1357,13 -1337,6 +1362,13 @@@
       <version>${commons.httpclient.version}</version>
      </dependency>
  
 +    <dependency>
 +      <groupId>org.opendaylight.controller</groupId>
 +      <artifactId>sanitytest</artifactId>
 +      <version>${controller.version}</version>
 +    </dependency>
 +
 +
    </dependencies>
  
  
@@@ -1406,6 -1379,8 +1411,6 @@@
            </execution>
          </executions>
        </plugin>
 -
      </plugins>
    </build>
 -
  </project>

diff --combined opendaylight/netconf/config-persister-impl/pom.xml
index 7fc2b584b88d7902a956f5a399145fee0fabad4f,915667028dbaaf2c279e9298b9a16cda0a2a743e..20bd386063419523d439dcb46102851208b6a7db
--- 1/opendaylight/netconf/config-persister-impl/pom.xml
--- 2/opendaylight/netconf/config-persister-impl/pom.xml
+++ b/opendaylight/netconf/config-persister-impl/pom.xml
@@@ -43,9 -43,7 +43,9 @@@
          </dependency>
          <dependency>
              <groupId>org.opendaylight.controller</groupId>
 -            <artifactId>config-persister-file-adapter</artifactId>
 +            <artifactId>config-persister-file-xml-adapter</artifactId>
 +            <scope>test</scope>
 +            <version>${config.version}</version>
          </dependency>
  
          <!-- test dependencies -->
@@@ -62,8 -60,8 +62,8 @@@
          </dependency>
          <dependency>
              <groupId>org.opendaylight.controller</groupId>
 -            <artifactId>config-persister-directory-adapter</artifactId>
 -            <version>${parent.version}</version>
 +            <artifactId>config-persister-directory-xml-adapter</artifactId>
 +            <version>${config.version}</version>
              <scope>test</scope>
          </dependency>
      </dependencies>
@@@ -90,6 -88,7 +90,7 @@@
                              org.opendaylight.controller.netconf.client,
                              org.opendaylight.controller.netconf.util.osgi,
                              org.opendaylight.controller.netconf.util.xml,
+                             org.opendaylight.controller.netconf.util.messages,
                              io.netty.channel,
                              io.netty.channel.nio,
                              io.netty.util.concurrent,