Code Review / ovsdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 45ce575)
Fixed commons maven build & moved bridge creation into ConfigurationService. 30/630/1
authorEvan Zeller <evanrzeller@gmail.com>
Tue, 23 Jul 2013 09:07:38 +0000 (05:07 -0400)
committerEvan Zeller <evanrzeller@gmail.com>
Tue, 23 Jul 2013 09:07:38 +0000 (05:07 -0400)
Signed-off-by: Evan Zeller <evanrzeller@gmail.com>
commons/commons.ovsdb.iml [new file with mode: 0755] patch | blob
commons/pom.xml patch | blob | history
ovsdb/ovsdb.iml [new file with mode: 0755] patch | blob
ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java patch | blob | history
ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java patch | blob | history

diff --git a/commons/commons.ovsdb.iml b/commons/commons.ovsdb.iml
new file mode 100755 (executable)
index 0000000..3dbd0e3
--- /dev/null
+++ b/commons/commons.ovsdb.iml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">\r
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">\r
+    <output url="file://$MODULE_DIR$/target/classes" />\r
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />\r
+    <exclude-output />\r
+    <content url="file://$MODULE_DIR$">\r
+      <excludeFolder url="file://$MODULE_DIR$/target" />\r
+    </content>\r
+    <orderEntry type="inheritedJdk" />\r
+    <orderEntry type="sourceFolder" forTests="false" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.9" level="project" />\r
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.9" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.3.3" level="project" />\r
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.3" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:javax.servlet:3.0.0.v201112011016" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:javax.servlet.jsp:2.2.0.v201112011158" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.ds:1.4.0.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.util:1.0.400.v20120522-2049" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.osgi.services:3.3.100.v20120522-1822" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.osgi:3.8.1.v20120830-144521" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.command:0.8.0.v201108120515" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.runtime:0.8.0.v201108120515" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.shell:0.8.0.v201110170705" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.cm:1.0.400.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.console:1.0.0.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.launcher:1.3.0.v20120522-1813" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.core:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.extender:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.tomcat:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.kernel.equinox.extensions:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.common:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.io:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.math:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.osgi:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.osgi.manifest:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.parser.manifest:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager:3.1.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.shell:1.4.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.6.0" level="project" />\r
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.fileinstall:3.1.6" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: virgomirror:org.eclipse.jdt.core.compiler.batch:3.8.0.I20120518-2145" level="project" />\r
+    <orderEntry type="library" name="Maven: eclipselink:javax.persistence:2.0.4.v201112161009" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.activation:1.1.0.v201211130549" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.annotation:1.1.0.v201209060031" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.ejb:3.1.1.v201204261316" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.el:2.2.0.v201108011116" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.mail.glassfish:1.4.1.v201108011116" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.xml.rpc:1.1.0.v201005080400" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina:7.0.32.v201211201336" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina.ha:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina.tribes:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.coyote:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.el:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.jasper:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.juli.extras:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.tomcat.api:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.tomcat.util:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.servlet.jsp.jstl:1.2.0.v201105211821" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.servlet.jsp.jstl.impl:1.2.0.v201210211230" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-container-native:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-lang:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-store:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-io:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-monitors:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-property:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-spi:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-spi:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:12.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.tinybundles:tinybundles:1.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: biz.aQute:bndlib:1.43.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.main.common:scattered-archive-api:3.1.2.2" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-core:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-lifecycle:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-tracker:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-net:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-link:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-commons:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-property:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-classpath:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-optional-jcl:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-junit4:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-link-mvn:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-aether:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-maven-commons:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-xml:1.3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-collections:1.3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-api:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-spi:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-util:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-impl:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-connector-wagon:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-utils:3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-classworlds:2.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-inject-plexus:2.2.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-inject-bean:2.2.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.0.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-aether-provider:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model-builder:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-repository-metadata:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-file:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-container-default:1.5.5" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-reflect:3.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.collections:google-collections:1.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.asm:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.aop:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.beans:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.context:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.expression:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.context.support:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.web.servlet:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.transaction:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.ow2.chameleon.management:chameleon-mbeans:1.0.0" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.portlet:portlet-api:2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: com.googlecode:jsonrpc4j:0.28" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.5" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.2.1" level="project" />\r
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1-b06" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-io:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:9.0.0.RC0" level="project" />\r
+  </component>\r
+</module>\r
+\r
diff --git a/commons/pom.xml b/commons/pom.xml
index 5b69026384d3f4a25b5250c6c5e720a47f66ddf0..2789d2422561f7e55f7a22cda0edb48e6578c6c7 100755 (executable)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -312,7 +312,7 @@
         </executions>
         <configuration>
           <failsOnError>true</failsOnError>
-          <configLocation>${project.parent.basedir}/space_and_tabs_checks.xml</configLocation>
+          <configLocation>${project.basedir}/space_and_tabs_checks.xml</configLocation>
           <consoleOutput>true</consoleOutput>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <sourceDirectory>${project.basedir}</sourceDirectory>
diff --git a/ovsdb/ovsdb.iml b/ovsdb/ovsdb.iml
new file mode 100755 (executable)
index 0000000..a7cdb39
--- /dev/null
+++ b/ovsdb/ovsdb.iml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">\r
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">\r
+    <output url="file://$MODULE_DIR$/target/classes" />\r
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />\r
+    <content url="file://$MODULE_DIR$">\r
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />\r
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />\r
+      <excludeFolder url="file://$MODULE_DIR$/target" />\r
+    </content>\r
+    <orderEntry type="inheritedJdk" />\r
+    <orderEntry type="sourceFolder" forTests="false" />\r
+    <orderEntry type="library" name="Maven: org.opendaylight.controller:sal:0.5.0-SNAPSHOT" level="project" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.2" level="project" />\r
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.9" level="project" />\r
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.9" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.8" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.3.3" level="project" />\r
+    <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.3" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.2" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:javax.servlet:3.0.0.v201112011016" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:javax.servlet.jsp:2.2.0.v201112011158" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.ds:1.4.0.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.util:1.0.400.v20120522-2049" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.osgi.services:3.3.100.v20120522-1822" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.osgi:3.8.1.v20120830-144521" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.command:0.8.0.v201108120515" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.runtime:0.8.0.v201108120515" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.apache.felix.gogo.shell:0.8.0.v201110170705" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.cm:1.0.400.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.console:1.0.0.v20120522-1841" level="project" />\r
+    <orderEntry type="library" name="Maven: equinoxSDK381:org.eclipse.equinox.launcher:1.3.0.v20120522-1813" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.core:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.extender:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.gemini.web.tomcat:2.2.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.kernel.equinox.extensions:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.common:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.io:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.math:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.osgi:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.osgi.manifest:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: geminiweb:org.eclipse.virgo.util.parser.manifest:3.6.0.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager:3.1.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.core:4.2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.osgi:org.osgi.compendium:4.2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.shell:1.4.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.gogo.runtime:0.6.0" level="project" />\r
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.felix:org.apache.felix.fileinstall:3.1.6" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: virgomirror:org.eclipse.jdt.core.compiler.batch:3.8.0.I20120518-2145" level="project" />\r
+    <orderEntry type="library" name="Maven: eclipselink:javax.persistence:2.0.4.v201112161009" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.activation:1.1.0.v201211130549" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.annotation:1.1.0.v201209060031" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.ejb:3.1.1.v201204261316" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.el:2.2.0.v201108011116" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.mail.glassfish:1.4.1.v201108011116" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.xml.rpc:1.1.0.v201005080400" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina:7.0.32.v201211201336" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina.ha:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.catalina.tribes:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.coyote:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.el:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.jasper:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.juli.extras:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.tomcat.api:7.0.32.v201211081135" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:org.apache.tomcat.util:7.0.32.v201211201952" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.servlet.jsp.jstl:1.2.0.v201105211821" level="project" />\r
+    <orderEntry type="library" name="Maven: orbit:javax.servlet.jsp.jstl.impl:1.2.0.v201210211230" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.asm:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.aop:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.aopalliance:com.springsource.org.aopalliance:1.0.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.beans:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.context:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.expression:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.context.support:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.web.servlet:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.7.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.springframework:org.springframework.transaction:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: org.ow2.chameleon.management:chameleon-mbeans:1.0.0" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.17" level="project" />\r
+    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />\r
+    <orderEntry type="library" name="Maven: org.opendaylight.controller.thirdparty:org.openflow.openflowj:1.0.2-SNAPSHOT" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />\r
+    <orderEntry type="library" name="Maven: com.googlecode:jsonrpc4j:0.28" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.0.2" level="project" />\r
+    <orderEntry type="library" name="Maven: javax.portlet:portlet-api:2.0" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:3.1.3.RELEASE" level="project" />\r
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.2.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.2.1" level="project" />\r
+    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1-b06" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock-junit4:2.5.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.jmock:jmock:2.5.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit-dep:4.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-io:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:9.0.0.RC0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-container-native:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-lang:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-store:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-io:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-monitors:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-property:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-spi:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-spi:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:12.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.tinybundles:tinybundles:1.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: biz.aQute:bndlib:1.43.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.glassfish.main.common:scattered-archive-api:3.1.2.2" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-core:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-lifecycle:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-tracker:1.6.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-net:1.4.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-link:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-commons:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-property:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-classpath:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.swissbox:pax-swissbox-optional-jcl:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-junit4:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.exam:pax-exam-link-mvn:3.0.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-aether:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.pax.url:pax-url-maven-commons:1.5.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-xml:1.3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.ops4j.base:ops4j-base-util-collections:1.3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-api:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-spi:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-util:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-impl:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.aether:aether-connector-wagon:1.13.1" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-utils:3.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-classworlds:2.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-inject-plexus:2.2.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-component-annotations:1.5.5" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-inject-bean:2.2.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.sonatype.sisu:sisu-guice:no_aop:3.0.3" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-aether-provider:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model-builder:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-interpolation:1.14" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-repository-metadata:3.0.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-file:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-7" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.codehaus.plexus:plexus-container-default:1.5.5" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.xbean:xbean-reflect:3.4" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.collections:google-collections:1.0" level="project" />\r
+    <orderEntry type="library" scope="TEST" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />\r
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.2.5" level="project" />\r
+  </component>\r
+</module>\r
+\r
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
index f85a8fafe9f01f10fe22b5581fa4bbddd173d500..9eba59690ee99e8e88085c0037717073165e93a5 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
@@ -103,7 +103,7 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
             OvsdbMessage msg = new OvsdbMessage("transact", params);
             try {
                 connection.sendMessage(msg);
-                connection.readResponse(String[].class);
+                connection.readResponse(Uuid[].class);
             } catch (Exception e) {
                 // TODO Auto-generated catch block
                 e.printStackTrace();
diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
index a243d5b0ae87da39c232dbb8ebf0e4dfcabc93e3..e720406548155bb33175f2a9e31555a4a3e85c98 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
@@ -10,6 +10,7 @@ import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;\r
 import org.opendaylight.ovsdb.database.Uuid;\r
 import org.opendaylight.ovsdb.internal.*;\r
+import org.opendaylight.ovsdb.sal.connection.ConnectionConstants;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -20,71 +21,21 @@ public class OvsdbTestAddBridge {
     public void addBridge() throws Throwable{\r
         Node.NodeIDType.registerIDType("OVS", String.class);\r
         NodeConnector.NodeConnectorIDType.registerIDType("OVS", String.class, "OVS");\r
-        String identifier = "TEST";\r
-        InetAddress address = InetAddress.getByName("172.16.3.196");\r
-        Connection connection = OvsdbIO.connect(identifier, address);\r
-        if (connection != null) {\r
-            String newBridge = "new_bridge";\r
-            String newInterface = "new_interface";\r
-            String newPort = "new_port";\r
-            String newSwitch = "new_switch";\r
-\r
-            Map<String, Object> bridgeRow = new HashMap<String, Object>();\r
-            bridgeRow.put("name", "br1");\r
-            ArrayList<String> ports = new ArrayList<String>();\r
-            ports.add("named-uuid");\r
-            ports.add(newPort);\r
-            bridgeRow.put("ports", ports);\r
-            InsertRequest addBridgeRequest = new InsertRequest("insert", "Bridge", newBridge, bridgeRow);\r
-\r
-            Map<String, Object> portRow = new HashMap<String, Object>();\r
-            portRow.put("name", "br1");\r
-            ArrayList<String> interfaces = new ArrayList<String>();\r
-            interfaces.add("named-uuid");\r
-            interfaces.add(newInterface);\r
-            portRow.put("interfaces", interfaces);\r
-            InsertRequest addPortRequest = new InsertRequest("insert", "Port", newPort, portRow);\r
 \r
-            Map<String, Object> interfaceRow = new HashMap<String, Object>();\r
-            interfaceRow.put("name", "br1");\r
-            interfaceRow.put("type", "internal");\r
-            InsertRequest addIntfRequest = new InsertRequest("insert", "Interface", newInterface, interfaceRow);\r
-\r
-            Map<String, Object> vswitchRow = new HashMap<String, Object>();\r
-            ArrayList<String> bridges = new ArrayList<String>();\r
-            bridges.add("named-uuid");\r
-            bridges.add(newBridge);\r
-            vswitchRow.put("bridges", bridges);\r
-            InsertRequest addSwitchRequest = new InsertRequest("insert", "Open_vSwitch", newSwitch, vswitchRow);\r
-\r
-            Object[] params = {"Open_vSwitch", addSwitchRequest, addIntfRequest, addPortRequest, addBridgeRequest};\r
-            OvsdbMessage msg = new OvsdbMessage("transact", params);\r
-            connection.sendMessage(msg);\r
-            connection.readResponse(Uuid[].class);\r
+        ConnectionService connectionService = new ConnectionService();\r
+        connectionService.init();\r
+        String identifier = "TEST";\r
+        Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();\r
+        params.put(ConnectionConstants.ADDRESS, "172.16.3.196");\r
 \r
+        Node node = connectionService.connect(identifier, params);\r
+        if(node == null){\r
+            logger.error("Could not connecto to ovsdb server");\r
+            return;\r
         }\r
+        ConfigurationService configurationService = new ConfigurationService();\r
+        configurationService.setConnectionServiceInternal(connectionService);\r
+        configurationService.createBridgeDomain(node, "JUNIT_BRIDGE_TEST");\r
     }\r
 \r
-    public void addPort() throws Throwable{\r
-        InetAddress address = InetAddress.getByName("172.16.3.169");\r
-        Connection connection = OvsdbIO.connect("add_port", address);\r
-        if(connection != null){\r
-            String newPort = "new_port";\r
-            String newIntf = "new_interface";\r
-\r
-            Map<String, Object> portRow = new HashMap<String, Object>();\r
-            portRow.put("name", "vnic0");\r
-            ArrayList<String> interfaces = new ArrayList<String>();\r
-            interfaces.add("named-uuid");\r
-            interfaces.add(newIntf);\r
-            portRow.put("interfaces", interfaces);\r
-            InsertRequest addPortRequest = new InsertRequest("insert", "Port", newPort, portRow);\r
-\r
-            Map<String,Object> intfRow = new HashMap<String, Object>();\r
-            intfRow.put("name", "vnic0");\r
-            InsertRequest addIntfRequest = new InsertRequest("insert", "Interface", newIntf, intfRow);\r
-\r
-\r
-        }\r
-    }\r
 }\r
Open vSwitch Database Management Protocol