From: Tony Tkacik Date: Wed, 25 Sep 2013 16:52:19 +0000 (+0200) Subject: Added sal-connector-* skeletons (REST connector, MB, Netconf). X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~700 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=074b70566f57a3234f4426e6ae7cd6d700c50cf2;p=controller.git Added sal-connector-* skeletons (REST connector, MB, Netconf). FIxed version of YANG Tools to 0.5.8 release Change-Id: Id20c9cd8798948f79c655b4d7f8ecad0d1dd392c Signed-off-by: Tony Tkacik --- diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 46ccf33b51..eede8979c6 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -47,11 +47,11 @@ 2.2.0.RELEASE 2.10 -Xmx1024m -XX:MaxPermSize=256m - 0.5.7-SNAPSHOT + 0.5.8 14.0.1 - 2010.09.24-SNAPSHOT - 2010.09.24-SNAPSHOT - 2013.09.07-SNAPSHOT + 2010.09.24.0 + 2010.09.24.0 + 2013.09.07.0 3.17.1-GA 1.0-SNAPSHOT 2.3.2 @@ -131,7 +131,7 @@ ${ietf-yang-types.version} - org.opendaylight.yangtools + org.opendaylight.yangtools.model yang-ext ${yang-ext.version} diff --git a/opendaylight/md-sal/model/model-flow-base/pom.xml b/opendaylight/md-sal/model/model-flow-base/pom.xml index 6c050735bb..ff88ba7575 100644 --- a/opendaylight/md-sal/model/model-flow-base/pom.xml +++ b/opendaylight/md-sal/model/model-flow-base/pom.xml @@ -24,7 +24,7 @@ org.opendaylight.yangtools.model opendaylight-l2-types - 2013.08.27-SNAPSHOT + 2013.08.27.0 bundle diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml index f7d9241c93..268cc6f2c4 100644 --- a/opendaylight/md-sal/model/pom.xml +++ b/opendaylight/md-sal/model/pom.xml @@ -19,7 +19,6 @@ pom - 0.5.7-SNAPSHOT UTF-8 2.3.7 @@ -74,7 +73,7 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.7-SNAPSHOT + ${yang.codegen.version} jar @@ -152,17 +151,17 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24-SNAPSHOT + 2010.09.24.0 org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24-SNAPSHOT + 2010.09.24.0 - org.opendaylight.yangtools + org.opendaylight.yangtools.model yang-ext - 2013.09.07-SNAPSHOT + 2013.09.07.0 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 89188fc33f..34d315f026 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -1,62 +1,65 @@ - 4.0.0 - org.opendaylight.controller - sal-parent - 1.0-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + pom - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - sal-common - sal-common-util + + sal-common + sal-common-util sal-dom-api sal-dom-broker sal-dom-spi - sal-binding-api - sal-binding-broker + sal-binding-api + sal-binding-broker samples model sal-compability - + + sal-connector-api + sal-rest-connector + - - UTF-8 - 1.7.2 - http://nexus.opendaylight.org/content - 0.5.8-SNAPSHOT - 2.3.7 + + UTF-8 + http://nexus.opendaylight.org/content + + 2.4.0 2.3.2 + + + 1.7.2 + 0.5.8 + 0.5.8 14.0.1 5.0.0 4.8.1 - + 2.4.3 + - central - maven repo1 - http://repo1.maven.org/maven2 - - false - - - true - - - - opendaylight.snapshot - opendaylight.snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ + central + maven repo1 + http://repo1.maven.org/maven2 + + false + + + true + opendaylight.release @@ -66,8 +69,7 @@ - - + opendaylight-release opendaylight-release @@ -79,202 +81,214 @@ opendaylight-snapshot ${nexusproxy}/repositories/opendaylight.snapshot/ + + thirdparty + thirdparty + ${nexusproxy}/repositories/thirdparty/ + - central - central - http://repo1.maven.org/maven2 - - false - - - true - - - - - - ebr-bundles-release - ebr-bundles-release - ${nexusproxy}/repositories/ebr-bundles-release/ - - - - - ebr-bundles-external - ebr-bundles-external - ${nexusproxy}/repositories/ebr-bundles-external/ - - - - - ops4j-releases - ops4j-releases - ${nexusproxy}/repositories/ops4j-releases/ - - - - thirdparty - thirdparty - ${nexusproxy}/repositories/thirdparty/ - - - - - jboss.releases - jboss.releases - ${nexusproxy}/repositories/jboss.releases/ + central + central + http://repo1.maven.org/maven2 - false + false - true + true - - - - + + + + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + website + ${sitedeploy} + + - - - - opendaylight-release - ${nexusproxy}/repositories/opendaylight.release/ - - - - opendaylight-snapshot - ${nexusproxy}/repositories/opendaylight.snapshot/ - - - - website - ${sitedeploy} - - + + - - - - com.google.guava - guava + + + + + + org.opendaylight.yangtools + yang-binding + ${yang.version} + + + org.opendaylight.yangtools + yang-common + ${yang.version} + + + org.opendaylight.yangtools + yang-data-api + ${yang.version} + + + org.opendaylight.yangtools + yang-model-api + ${yang.version} + + + org.opendaylight.yangtools + yang-data-util + ${yang.version} + + + + ${project.groupId} + sal-connector-api + ${project.version} + + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + com.google.guava + guava ${guava.version} - - - org.slf4j - slf4j-api - 1.7.2 - - - junit - junit - ${junit.version} + + + org.eclipse.xtend + org.eclipse.xtend.lib + ${xtend.version} + + + + + junit + junit + ${junit.version} test - - - org.opendaylight.yangtools - yang-binding - ${yang.version} - - - org.opendaylight.yangtools - yang-common - ${yang.version} - - - org.opendaylight.yangtools - yang-data-api - ${yang.version} - - - org.opendaylight.yangtools - yang-model-api - ${yang.version} - - - org.opendaylight.yangtools - yang-data-util - ${yang.version} - + org.mockito mockito-all 1.9.5 test - - - - - - + + + + - + + + org.apache.maven.plugins + maven-release-plugin + ${releaseplugin.version} + + + org.apache.felix + maven-bundle-plugin + ${bundle.plugin.version} + true + + + ${project.groupId}.${project.artifactId} + + ${project.basedir}/META-INF + + + + org.eclipse.xtend + xtend-maven-plugin + ${xtend.version} + + + + compile + + + ${basedir}/src/main/xtend-gen + + + + + + maven-clean-plugin + + + + ${basedir}/src/main/xtend-gen + + ** + + + + + + + + - org.apache.maven.plugins - maven-release-plugin - ${releaseplugin.version} + org.apache.felix + maven-bundle-plugin - - - - - org.apache.felix - maven-bundle-plugin - ${bundle.plugin.version} - true - - - ${project.groupId}.${project.artifactId} - - ${project.basedir}/META-INF - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 5975999e1a..e0721dffdf 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -39,31 +39,9 @@ org.eclipse.xtend xtend-maven-plugin - 2.4.2 - - - - compile - - - ${basedir}/src/main/xtend-gen - - - maven-clean-plugin - 2.4.1 - - - - ${basedir}/src/main/xtend-gen - - ** - - - - @@ -79,9 +57,6 @@ sal-binding-api 1.0-SNAPSHOT - - org.slf4j slf4j-api @@ -106,13 +81,18 @@ 3.17.1-GA - org.eclipse.xtend - org.eclipse.xtend.lib - 2.4.2 + junit + junit + test org.mockito mockito-all + test + + + org.eclipse.xtend + org.eclipse.xtend.lib junit diff --git a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java index c942159f49..d9cf5cc477 100644 --- a/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java +++ b/opendaylight/md-sal/sal-common-util/src/main/java/org/opendaylight/controller/sal/common/util/Futures.java @@ -7,45 +7,46 @@ import java.util.concurrent.TimeoutException; public class Futures { - private Futures(){} - - public static Future immediateFuture(T result) { - return new ImmediateFuture(result); - } - - private static class ImmediateFuture implements Future { - - private final T result; - - public ImmediateFuture(T result) { - this.result = result; - } - - @Override - public boolean cancel(boolean mayInterruptIfRunning) { - return false; - } - - @Override - public boolean isCancelled() { - return false; - } - - @Override - public boolean isDone() { - return true; - } - - @Override - public T get() throws InterruptedException, ExecutionException { - return result; - } - - @Override - public T get(long timeout, TimeUnit unit) throws InterruptedException, - ExecutionException, TimeoutException { - return result; - } - - } + private Futures() { + } + + public static Future immediateFuture(T result) { + return new ImmediateFuture(result); + } + + private static class ImmediateFuture implements Future { + + private final T result; + + public ImmediateFuture(T result) { + this.result = result; + } + + @Override + public boolean cancel(boolean mayInterruptIfRunning) { + return false; + } + + @Override + public boolean isCancelled() { + return false; + } + + @Override + public boolean isDone() { + return true; + } + + @Override + public T get() throws InterruptedException, ExecutionException { + return result; + } + + @Override + public T get(long timeout, TimeUnit unit) throws InterruptedException, + ExecutionException, TimeoutException { + return result; + } + + } } diff --git a/opendaylight/md-sal/sal-compability/pom.xml b/opendaylight/md-sal/sal-compability/pom.xml index 172e81fa82..3d1679425c 100644 --- a/opendaylight/md-sal/sal-compability/pom.xml +++ b/opendaylight/md-sal/sal-compability/pom.xml @@ -1,52 +1,57 @@ - 4.0.0 - - org.opendaylight.controller - sal-parent - 1.0-SNAPSHOT - - sal-compability + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-compability - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - - org.opendaylight.controller - sal - 0.5.0-SNAPSHOT - - - org.opendaylight.controller.model - model-flow-service - 1.0-SNAPSHOT - - - org.opendaylight.controller.model - model-flow-statistics - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-binding-api - 1.0-SNAPSHOT - - - org.opendaylight.controller - sal-common-util - 1.0-SNAPSHOT - - - com.google.guava - guava - 14.0.1 - - - junit - junit - - + + + org.opendaylight.controller + sal + 0.5.0-SNAPSHOT + + + org.opendaylight.controller.model + model-flow-service + 1.0-SNAPSHOT + + + org.opendaylight.controller.model + model-flow-statistics + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-common-util + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-binding-api + 1.0-SNAPSHOT + + + org.opendaylight.controller + sal-common-util + 1.0-SNAPSHOT + + + com.google.guava + guava + + + junit + junit + test + + diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml new file mode 100644 index 0000000000..68c8756e46 --- /dev/null +++ b/opendaylight/md-sal/sal-connector-api/pom.xml @@ -0,0 +1,29 @@ + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-connector-api + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + org.opendaylight.yangtools + yang-data-api + + + org.opendaylight.yangtools + yang-model-api + + + + + bundle + diff --git a/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java new file mode 100644 index 0000000000..e47d67e8cf --- /dev/null +++ b/opendaylight/md-sal/sal-connector-api/src/main/java/org/opendaylight/controller/sal/connector/api/Connector.java @@ -0,0 +1,9 @@ +package org.opendaylight.controller.sal.connector.api; + +import java.util.Set; + +import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; + +public interface Connector { + +} diff --git a/opendaylight/md-sal/sal-dom-it/pom.xml b/opendaylight/md-sal/sal-dom-it/pom.xml new file mode 100644 index 0000000000..5604a87552 --- /dev/null +++ b/opendaylight/md-sal/sal-dom-it/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-dom-it + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + org.opendaylight.controller + sal-broker-impl + 1.0-SNAPSHOT + + + org.opendaylight.controller + yang-data-util + + + org.mockito + mockito-all + 1.9.5 + test + + + org.slf4j + slf4j-simple + 1.7.2 + runtime + + + + + + maven-assembly-plugin + 2.4 + + + jar-with-dependencies + + + + org.opendaylight.controller.sal.demo.SALDemo + + + + + + make-assembly + package + + single + + + + + + + diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml new file mode 100644 index 0000000000..c8bc71577d --- /dev/null +++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-netconf-connector + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + ${project.groupId} + sal-connector-api + + + + bundle + diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml new file mode 100644 index 0000000000..bee4280a32 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.0-SNAPSHOT + + sal-rest-connector + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + + + ${project.groupId} + sal-connector-api + + + + bundle + diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/package-info.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/package-info.java new file mode 100644 index 0000000000..9721b9ae82 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/package-info.java @@ -0,0 +1,5 @@ +/** + * + * + */ +package org.opendaylight.controller.sal.rest.api; \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/package-info.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/package-info.java new file mode 100644 index 0000000000..71dee0496d --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/package-info.java @@ -0,0 +1,8 @@ +/** + * + */ +/** + * @author ttkacik + * + */ +package org.opendaylight.controller.sal.rest.impl; \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/package-info.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/package-info.java new file mode 100644 index 0000000000..5e9c17439b --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/package-info.java @@ -0,0 +1,5 @@ +/** + * @author ttkacik + * + */ +package org.opendaylight.controller.sal.restconf.impl; \ No newline at end of file diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml index b57fad1576..f93bb339b9 100644 --- a/opendaylight/md-sal/samples/toaster/pom.xml +++ b/opendaylight/md-sal/samples/toaster/pom.xml @@ -19,7 +19,7 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.7-SNAPSHOT + ${yang.version} @@ -37,16 +37,15 @@ - false + true - org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.5.7-SNAPSHOT + ${yang.codegen.version} jar