Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 325258b 2e8e671)
Merge "Bug: 627 Added RESTConf API Explorer that dynamically generates API documentat...
authorTony Tkacik <ttkacik@cisco.com>
Tue, 6 May 2014 06:52:40 +0000 (06:52 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 6 May 2014 06:52:40 +0000 (06:52 +0000)
1  2 
opendaylight/commons/opendaylight/pom.xml patch | diff1 | diff2 | blob | history
opendaylight/distribution/opendaylight/pom.xml patch | diff1 | diff2 | blob | history
opendaylight/md-sal/pom.xml patch | diff1 | diff2 | blob | history

diff --combined opendaylight/commons/opendaylight/pom.xml
index 545c01060a1757c7c4f4df2279d688861b4922d0,a0db37df02b3fb1e307cf4e4d88dd15c6a53e5cb..c0fc4024ce5c090224cbcec8df6edc3821211834
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -19,7 -19,6 +19,7 @@@
      <appauth.version>0.4.2-SNAPSHOT</appauth.version>
      <!-- Controller Modules Versions -->
      <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
 +    <asm.version>4.1</asm.version>
      <!-- Plugin Versions -->
      <bouncycastle.version>1.50</bouncycastle.version>
      <bundle.plugin.version>2.3.7</bundle.plugin.version>
@@@ -58,7 -57,6 +58,7 @@@
      <!-- OpenEXI third party lib for netconf-->
      <exi.nagasena.version>0000.0002.0038.0-SNAPSHOT</exi.nagasena.version>
      <failsafe.version>2.15</failsafe.version>
 +    <feature.transaction.version>1.0.1</feature.transaction.version>
      <felix.dependencymanager.shell.version>3.0.1</felix.dependencymanager.shell.version>
      <felix.dependencymanager.version>3.1.0</felix.dependencymanager.version>
      <felix.fileinstall.version>3.1.6</felix.fileinstall.version>
@@@ -79,7 -77,7 +79,7 @@@
      <ietf-inet-types.version>2010.09.24.4-SNAPSHOT</ietf-inet-types.version>
      <ietf-topology.version>2013.10.21.2-SNAPSHOT</ietf-topology.version>
      <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
-     <jackson.version>2.3.0</jackson.version>
+     <jackson.version>2.3.2</jackson.version>
      <jacoco.version>0.6.2.201302030002</jacoco.version>
      <jar.plugin.version>2.4</jar.plugin.version>
      <java.version.source>1.7</java.version.source>
@@@ -94,7 -92,6 +94,7 @@@
      <jsr305.api.version>2.0.1</jsr305.api.version>
      <jsr311.api.version>1.1.1</jsr311.api.version>
      <junit.version>4.8.1</junit.version>
 +    <karaf.version>3.0.1</karaf.version>
      <logback.version>1.0.9</logback.version>
      <logging.bridge.version>0.4.2-SNAPSHOT</logging.bridge.version>
      <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
@@@ -112,6 -109,7 +112,7 @@@
      <!-- ODL repository / plugin repository -->
      <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
      <opendaylight-l2-types.version>2013.08.27.4-SNAPSHOT</opendaylight-l2-types.version>
+     <org.json.version>20080701</org.json.version>
      <osgi-brandfragment.web.version>0.0.2-SNAPSHOT</osgi-brandfragment.web.version>
      <osgi.compendium.version>5.0.0</osgi.compendium.version>
      <osgi.core.version>5.0.0</osgi.core.version>
@@@ -143,9 -141,7 +144,9 @@@
      <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
      <sonar.language>java</sonar.language>
      <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
 +    <spifly.version>1.0.0</spifly.version>
      <spring-osgi.version>1.2.1</spring-osgi.version>
 +    <spring-security-karaf.version>3.1.4.RELEASE</spring-security-karaf.version>
      <spring-security.version>3.1.3.RELEASE</spring-security.version>
      <spring.version>3.1.3.RELEASE</spring.version>
      <statistics.northbound.version>0.4.2-SNAPSHOT</statistics.northbound.version>
@@@ -211,6 -207,12 +212,12 @@@
          <artifactId>jackson-databind</artifactId>
          <version>${jackson.version}</version>
        </dependency>
+       <dependency>
+         <groupId>com.fasterxml.jackson.datatype</groupId>
+         <artifactId>jackson-datatype-json-org</artifactId>
+         <version>${jackson.version}</version>
+       </dependency>
+ 
        <dependency>
          <groupId>com.fasterxml.jackson.jaxrs</groupId>
          <artifactId>jackson-jaxrs-base</artifactId>
@@@ -616,6 -618,11 +623,11 @@@
          <artifactId>jolokia-osgi</artifactId>
          <version>${jolokia.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.json</groupId>
+         <artifactId>json</artifactId>
+         <version>${org.json.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>appauth</artifactId>
@@@ -875,13 -882,6 +887,13 @@@
          <artifactId>netconf-client</artifactId>
          <version>${netconf.version}</version>
        </dependency>
 +
 +      <!--Netconf config-->
 +      <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>netconf-config-dispatcher</artifactId>
 +        <version>${netconf.version}</version>
 +      </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netconf-impl</artifactId>
@@@ -1087,6 -1087,11 +1099,11 @@@
          <artifactId>sal-rest-connector</artifactId>
          <version>${mdsal.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>sal-rest-docgen</artifactId>
+         <version>${mdsal.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>sal-restconf-broker</artifactId>
@@@ -1425,6 -1430,11 +1442,11 @@@
          <artifactId>yang-model-util</artifactId>
          <version>${yangtools.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.yangtools</groupId>
+         <artifactId>yang-parser-api</artifactId>
+         <version>${yangtools.version}</version>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>yang-parser-impl</artifactId>
@@@ -1778,7 -1788,6 +1800,7 @@@
                <phase>generate-sources</phase>
                <configuration>
                  <sources>
 +                  <source>src/main/yang</source>
                    <source>${jmxGeneratorPath}</source>
                    <source>${salGeneratorPath}</source>
                    <source>${xtend.dstdir}</source>
@@@ -1875,7 -1884,7 +1897,7 @@@
                      </goals>
                    </pluginExecutionFilter>
                    <action>
 -                    <ignore></ignore>
 +                    <execute></execute>
                    </action>
                  </pluginExecution>
                  <pluginExecution>
diff --combined opendaylight/distribution/opendaylight/pom.xml
index 648c59e906e51b3466be0cff0f1277cbf2a0d68a,4eb764fa39e1040b6a2b0e3c44381240f4ef568e..615668f5ebd766c07705161698826a2c4c3f6c90
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -39,6 -39,11 +39,11 @@@
        <artifactId>jackson-databind</artifactId>
      </dependency>
  
+     <dependency>
+       <groupId>com.fasterxml.jackson.datatype</groupId>
+       <artifactId>jackson-datatype-json-org</artifactId>
+     </dependency>
+ 
      <dependency>
        <groupId>com.fasterxml.jackson.jaxrs</groupId>
        <artifactId>jackson-jaxrs-base</artifactId>
@@@ -53,6 -58,7 +58,7 @@@
        <groupId>com.fasterxml.jackson.module</groupId>
        <artifactId>jackson-module-jaxb-annotations</artifactId>
      </dependency>
+ 
      <dependency>
        <groupId>com.google.code.gson</groupId>
        <artifactId>gson</artifactId>
@@@ -341,6 -347,11 +347,11 @@@
        <groupId>org.jolokia</groupId>
        <artifactId>jolokia-osgi</artifactId>
      </dependency>
+ 
+     <dependency>
+       <groupId>org.json</groupId>
+       <artifactId>json</artifactId>
+     </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>appauth</artifactId>
@@@ -865,12 -876,6 +876,12 @@@
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>netconf-client</artifactId>
          </dependency>
 +
 +        <!--Netconf config-->
 +        <dependency>
 +          <groupId>org.opendaylight.controller</groupId>
 +          <artifactId>netconf-config-dispatcher</artifactId>
 +        </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>netconf-impl</artifactId>
@@@ -987,6 -992,10 +998,10 @@@
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-rest-connector</artifactId>
          </dependency>
+         <dependency>
+           <groupId>org.opendaylight.controller</groupId>
+           <artifactId>sal-rest-docgen</artifactId>
+         </dependency>
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
            <artifactId>sal-restconf-broker</artifactId>
diff --combined opendaylight/md-sal/pom.xml
index b003ba15e505c58384fd5c2cc1d04d513f2abf36,8760a34c2350be11704ee4f88527ed13c989b92f..451edfdf78cb84c734590472507898b9a7b99ac2
--- 1/opendaylight/md-sal/pom.xml
--- 2/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@@ -59,7 -59,8 +59,8 @@@
      <module>sal-remoterpc-connector/implementation</module>
      <!--module>clustered-data-store/implementation</module>
         -->
- 
+     <!-- Documentation -->
+     <module>sal-rest-docgen</module>
    </modules>
  
    <build>
@@@ -91,6 -92,19 +92,6 @@@
                <pluginExecutions>
                  <pluginExecution>
                    <pluginExecutionFilter>
 -                    <groupId>org.opendaylight.yangtools</groupId>
 -                    <artifactId>yang-maven-plugin</artifactId>
 -                    <versionRange>[0,)</versionRange>
 -                    <goals>
 -                      <goal>generate-sources</goal>
 -                    </goals>
 -                  </pluginExecutionFilter>
 -                  <action>
 -                    <ignore></ignore>
 -                  </action>
 -                </pluginExecution>
 -                <pluginExecution>
 -                  <pluginExecutionFilter>
                      <groupId>net.alchim31.maven</groupId>
                      <artifactId>scala-maven-plugin</artifactId>
                      <versionRange>[0,)</versionRange>
OpenDaylight controller