From: Tony Tkacik Date: Mon, 3 Mar 2014 09:39:47 +0000 (+0000) Subject: Merge "Eradicate exificient from the repository" X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~359 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=011123a270b7126d8c49191a88e48f15106bb4c8;hp=96b7baaf2c3b74170f47438deb676877ced0b0f6 Merge "Eradicate exificient from the repository" --- diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index c0e857c79c..77c807b0ed 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -1802,11 +1802,17 @@ maven-release-plugin ${releaseplugin.version} + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + org.opendaylight.yangtools yang-maven-plugin ${yangtools.version} + org.eclipse.m2e diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/02-toaster-sample.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/02-toaster-sample.xml new file mode 100644 index 0000000000..c481485c92 --- /dev/null +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/02-toaster-sample.xml @@ -0,0 +1,73 @@ + + + + + + + prefix:toaster-provider-impl + + toaster-provider-impl + + + binding:binding-rpc-registry + binding-rpc-broker + + + + + binding:binding-notification-service + + binding-notification-broker + + + + + + prefix:toaster-consumer-impl + + toaster-consumer-impl + + + binding:binding-rpc-registry + binding-rpc-broker + + + + + binding:binding-notification-service + + binding-notification-broker + + + + + + + toaster:toaster-provider + + toaster-provider + /modules/module[type='toaster-provider-impl'][name='toaster-provider-impl'] + + + + toaster:toaster-consumer + + toaster-consumer + /modules/module[type='toaster-consumer-impl'][name='toaster-consumer-impl'] + + + + + + + + + urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 + urn:opendaylight:params:xml:ns:yang:controller:config:toaster-consumer?module=toaster-consumer&revision=2014-01-31 + urn:opendaylight:params:xml:ns:yang:controller:config:toaster-consumer:impl?module=toaster-consumer-impl&revision=2014-01-31 + urn:opendaylight:params:xml:ns:yang:controller:config:toaster-provider?module=toaster-provider&revision=2014-01-31 + urn:opendaylight:params:xml:ns:yang:controller:config:toaster-provider:impl?module=toaster-provider-impl&revision=2014-01-31 + + + + diff --git a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml index 7ac45f47b6..3cc857098c 100644 --- a/opendaylight/forwardingrulesmanager/integrationtest/pom.xml +++ b/opendaylight/forwardingrulesmanager/integrationtest/pom.xml @@ -142,20 +142,10 @@ ../implementation/target/jacoco-it.exec - - - - org.jacoco - jacoco-maven-plugin - 0.5.3.201107060350 - - - org.jacoco jacoco-maven-plugin - ${jacoco.version} ../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/hosttracker/integrationtest/pom.xml b/opendaylight/hosttracker/integrationtest/pom.xml index 17f43057d7..e4e7790012 100644 --- a/opendaylight/hosttracker/integrationtest/pom.xml +++ b/opendaylight/hosttracker/integrationtest/pom.xml @@ -135,20 +135,10 @@ - - - - org.jacoco - jacoco-maven-plugin - 0.5.3.201107060350 - - - org.jacoco jacoco-maven-plugin - ${jacoco.version} ../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml index 289afbbce3..33cd94d6a8 100644 --- a/opendaylight/md-sal/sal-netconf-connector/pom.xml +++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml @@ -44,7 +44,6 @@ org.opendaylight.controller sal-broker-impl - 1.1-SNAPSHOT test jar diff --git a/opendaylight/md-sal/sal-remote/pom.xml b/opendaylight/md-sal/sal-remote/pom.xml index b0424f945b..090c56f67d 100644 --- a/opendaylight/md-sal/sal-remote/pom.xml +++ b/opendaylight/md-sal/sal-remote/pom.xml @@ -17,7 +17,6 @@ org.opendaylight.controller sal-binding-api - 1.1-SNAPSHOT diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend index 9b5c507811..2b9c78bb87 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.xtend @@ -43,14 +43,14 @@ import org.opendaylight.yangtools.yang.model.api.ListSchemaNode import org.opendaylight.yangtools.yang.model.api.Module import org.opendaylight.yangtools.yang.model.api.RpcDefinition import org.opendaylight.yangtools.yang.model.api.SchemaContext -import org.opendaylight.yangtools.yang.model.api.SchemaServiceListener +import org.opendaylight.yangtools.yang.model.api.SchemaContextListener import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition import org.slf4j.LoggerFactory import static com.google.common.base.Preconditions.* import static javax.ws.rs.core.Response.Status.* -class ControllerContext implements SchemaServiceListener { +class ControllerContext implements SchemaContextListener { val static LOG = LoggerFactory.getLogger(ControllerContext) val static ControllerContext INSTANCE = new ControllerContext val static NULL_VALUE = "null" diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index fca9783f61..07a7d41ee7 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -106,12 +106,10 @@ org.opendaylight.controller config-api - ${config.version} org.opendaylight.controller sal-binding-config - ${sal-binding-api.version} diff --git a/opendaylight/netconf/config-persister-impl/pom.xml b/opendaylight/netconf/config-persister-impl/pom.xml index daaf60c1d3..c0b9f68814 100644 --- a/opendaylight/netconf/config-persister-impl/pom.xml +++ b/opendaylight/netconf/config-persister-impl/pom.xml @@ -44,7 +44,6 @@ org.opendaylight.controller config-persister-file-xml-adapter test - ${config.version} @@ -71,7 +70,6 @@ org.opendaylight.controller config-persister-directory-xml-adapter - ${config.version} test diff --git a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageHeaderTest.java b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageHeaderTest.java index 959e2ff144..eb975216e2 100644 --- a/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageHeaderTest.java +++ b/opendaylight/netconf/netconf-impl/src/test/java/org/opendaylight/controller/netconf/impl/MessageHeaderTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.controller.netconf.util.messages.NetconfMessageHeader; +@Deprecated public class MessageHeaderTest { @Test public void testFromBytes() { diff --git a/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java b/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java index 7e4b9b9aa4..4928ddef3b 100644 --- a/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java +++ b/opendaylight/northbound/flowprogrammer/src/main/java/org/opendaylight/controller/flowprogrammer/northbound/FlowProgrammerNorthbound.java @@ -454,7 +454,8 @@ public class FlowProgrammerNorthbound { .build(); } handleResourceCongruence(name, flowConfig.getName()); - handleResourceCongruence(nodeId, flowConfig.getNode().getNodeIDString()); + handleResourceCongruence(nodeType, flowConfig.getNode().getType()); + handleResourceCongruence(nodeId, flowConfig.getNode().getID() == null ? null : flowConfig.getNode().getNodeIDString()); handleDefaultDisabled(containerName); IForwardingRulesManager frm = getForwardingRulesManagerService(containerName); diff --git a/opendaylight/statisticsmanager/integrationtest/pom.xml b/opendaylight/statisticsmanager/integrationtest/pom.xml index 142842ef90..21664cde6a 100644 --- a/opendaylight/statisticsmanager/integrationtest/pom.xml +++ b/opendaylight/statisticsmanager/integrationtest/pom.xml @@ -142,20 +142,10 @@ ../implementation/target/jacoco-it.exec - - - - org.jacoco - jacoco-maven-plugin - 0.5.3.201107060350 - - - org.jacoco jacoco-maven-plugin - ${jacoco.version} ../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/switchmanager/integrationtest/pom.xml b/opendaylight/switchmanager/integrationtest/pom.xml index 22ceeb419b..daee7a33a8 100644 --- a/opendaylight/switchmanager/integrationtest/pom.xml +++ b/opendaylight/switchmanager/integrationtest/pom.xml @@ -123,7 +123,6 @@ org.jacoco jacoco-maven-plugin - ${jacoco.version} ../implementation/target/jacoco-it.exec org.opendaylight.controller.* diff --git a/opendaylight/topologymanager/integrationtest/pom.xml b/opendaylight/topologymanager/integrationtest/pom.xml index 0a36cbdb1e..a72138548a 100644 --- a/opendaylight/topologymanager/integrationtest/pom.xml +++ b/opendaylight/topologymanager/integrationtest/pom.xml @@ -93,20 +93,10 @@ ../implementaiton/target/jacoco-it.exec - - - - org.jacoco - jacoco-maven-plugin - 0.5.3.201107060350 - - - org.jacoco jacoco-maven-plugin - 0.5.3.201107060350 ../implementation/target/jacoco-it.exec org.opendaylight.controller.*