From: Ed Warnicke Date: Wed, 5 Nov 2014 00:29:54 +0000 (-0600) Subject: Remove legacy distribution. X-Git-Tag: release/lithium~875 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=df4aabedd8d9a63da661845c70042102f36a14b5 Remove legacy distribution. Change-Id: I0652f606efb99a4c8bcb06df8418413c3cc68d8c Signed-off-by: Ed Warnicke --- diff --git a/opendaylight/distribution/opendaylight/opendaylight-application.launch b/opendaylight/distribution/opendaylight/opendaylight-application.launch deleted file mode 100644 index cd9fc94343..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-application.launch +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-fast.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-fast.launch deleted file mode 100644 index bc5c53ca95..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-fast.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-full.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-full.launch deleted file mode 100644 index 82b9fe22d0..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-full.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch deleted file mode 100644 index f42f6577f0..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch deleted file mode 100644 index 753839c0bb..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch deleted file mode 100644 index b498f908f2..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch deleted file mode 100644 index 0edd2a734a..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-local.target b/opendaylight/distribution/opendaylight/opendaylight-local.target deleted file mode 100644 index a7780fe610..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-local.target +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch deleted file mode 100644 index 98de065c5b..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch deleted file mode 100644 index b14197f3d6..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-sonar-fast.launch b/opendaylight/distribution/opendaylight/opendaylight-sonar-fast.launch deleted file mode 100644 index 6d5a588441..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-sonar-fast.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight-sonar.launch b/opendaylight/distribution/opendaylight/opendaylight-sonar.launch deleted file mode 100644 index bb66bd8a92..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight-sonar.launch +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/opendaylight.target b/opendaylight/distribution/opendaylight/opendaylight.target deleted file mode 100644 index 7ae309cce4..0000000000 --- a/opendaylight/distribution/opendaylight/opendaylight.target +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml deleted file mode 100644 index cd02759f5a..0000000000 --- a/opendaylight/distribution/opendaylight/pom.xml +++ /dev/null @@ -1,1440 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.5.0-SNAPSHOT - ../../commons/opendaylight - - distribution.opendaylight - 0.2.0-SNAPSHOT - pom - - 3.0 - - - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - - com.fasterxml.jackson.core - jackson-annotations - - - - com.fasterxml.jackson.core - jackson-core - - - - com.fasterxml.jackson.core - jackson-databind - - - - com.fasterxml.jackson.datatype - jackson-datatype-json-org - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - - com.fasterxml.jackson.module - jackson-module-jaxb-annotations - - - - com.google.code.gson - gson - - - com.google.guava - guava - - - com.sun.jersey - jersey-client - - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - commons-codec - commons-codec - - - commons-fileupload - commons-fileupload - - - commons-io - commons-io - - - commons-net - commons-net - - - eclipselink - javax.persistence - - - eclipselink - javax.resource - - - equinoxSDK381 - javax.servlet - - - equinoxSDK381 - javax.servlet.jsp - - - equinoxSDK381 - org.apache.felix.gogo.command - - - equinoxSDK381 - org.apache.felix.gogo.runtime - - - equinoxSDK381 - org.apache.felix.gogo.shell - - - equinoxSDK381 - org.eclipse.equinox.cm - - - equinoxSDK381 - org.eclipse.equinox.console - - - equinoxSDK381 - org.eclipse.equinox.ds - - - equinoxSDK381 - org.eclipse.equinox.launcher - - - equinoxSDK381 - org.eclipse.equinox.util - - - equinoxSDK381 - org.eclipse.osgi - - - equinoxSDK381 - org.eclipse.osgi.services - - - - geminiweb - org.eclipse.gemini.web.core - - - geminiweb - org.eclipse.gemini.web.extender - - - geminiweb - org.eclipse.gemini.web.tomcat - - - geminiweb - org.eclipse.virgo.kernel.equinox.extensions - - - geminiweb - org.eclipse.virgo.util.common - - - geminiweb - org.eclipse.virgo.util.io - - - geminiweb - org.eclipse.virgo.util.math - - - geminiweb - org.eclipse.virgo.util.osgi - - - geminiweb - org.eclipse.virgo.util.osgi.manifest - - - geminiweb - org.eclipse.virgo.util.parser.manifest - - - io.netty - netty-buffer - - - io.netty - netty-codec - - - io.netty - netty-codec-http - - - io.netty - netty-common - - - - - io.netty - netty-handler - - - io.netty - netty-transport - - - orbit - javax.activation - - - orbit - javax.annotation - - - orbit - javax.ejb - - - orbit - javax.el - - - orbit - javax.mail.glassfish - - - orbit - javax.servlet.jsp.jstl - - - orbit - javax.servlet.jsp.jstl.impl - - - orbit - javax.xml.rpc - - - orbit - org.apache.catalina - - - orbit - org.apache.catalina.ha - - - orbit - org.apache.catalina.tribes - - - orbit - org.apache.coyote - - - orbit - org.apache.el - - - orbit - org.apache.jasper - - - orbit - org.apache.juli.extras - - - orbit - org.apache.tomcat.api - - - orbit - org.apache.tomcat.util - - - org.aopalliance - com.springsource.org.aopalliance - - - org.apache.commons - commons-lang3 - - - org.apache.felix - org.apache.felix.dependencymanager - - - org.apache.felix - org.apache.felix.dependencymanager.shell - - - org.apache.felix - org.apache.felix.fileinstall - - - - org.apache.felix - org.apache.felix.webconsole - all - - - - org.codehaus.jettison - jettison - - - - org.eclipse.equinox.http - servlet - - - org.eclipse.persistence - org.eclipse.persistence.antlr - - - org.eclipse.persistence - org.eclipse.persistence.core - - - org.eclipse.persistence - org.eclipse.persistence.moxy - - - org.javassist - javassist - - - org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec - - - org.jolokia - jolokia-osgi - - - - org.json - json - - - org.opendaylight.controller - appauth - - - org.opendaylight.controller - arphandler - - - org.opendaylight.controller - bundlescanner - - - org.opendaylight.controller - bundlescanner.implementation - - - org.opendaylight.controller - clustering.services - - - org.opendaylight.controller - clustering.services-implementation - - - - - org.opendaylight.controller - clustering.test - - - org.opendaylight.controller - commons.httpclient - - - - - org.opendaylight.controller - commons.northbound - - - org.opendaylight.controller - configuration - - - org.opendaylight.controller - configuration.implementation - - - org.opendaylight.controller - connectionmanager - - - org.opendaylight.controller - connectionmanager.implementation - - - org.opendaylight.controller - connectionmanager.northbound - - - org.opendaylight.controller - containermanager - - - org.opendaylight.controller - containermanager.implementation - - - org.opendaylight.controller - containermanager.northbound - - - org.opendaylight.controller - controllermanager.northbound - - - org.opendaylight.controller - devices.web - - - org.opendaylight.controller - flowprogrammer.northbound - - - org.opendaylight.controller - flows.web - - - org.opendaylight.controller - forwarding.staticrouting - - - org.opendaylight.controller - forwarding.staticrouting.northbound - - - org.opendaylight.controller - forwardingrulesmanager - - - org.opendaylight.controller - forwardingrulesmanager.implementation - - - org.opendaylight.controller - hosttracker - - - org.opendaylight.controller - hosttracker.implementation - - - org.opendaylight.controller - hosttracker.northbound - - - org.opendaylight.controller - httpservice-bridge - - - org.opendaylight.controller - jolokia-bridge - - - - - org.opendaylight.controller - logging.bridge - - - org.opendaylight.controller - networkconfig.bridgedomain.northbound - - - - - org.opendaylight.controller - networkconfig.neutron - - - org.opendaylight.controller - networkconfig.neutron.implementation - - - org.opendaylight.controller - networkconfig.neutron.northbound - - - org.opendaylight.controller - osgi-brandfragment.web - - - - - org.opendaylight.controller - protocol_plugins.openflow - - - org.opendaylight.controller - routing.dijkstra_implementation - - - - - org.opendaylight.controller - sal - - - - - - org.opendaylight.controller - sal.connection - - - org.opendaylight.controller - sal.connection.implementation - - - org.opendaylight.controller - sal.implementation - - - org.opendaylight.controller - sal.networkconfiguration - - - org.opendaylight.controller - sal.networkconfiguration.implementation - - - - - org.opendaylight.controller - samples.loadbalancer - - - org.opendaylight.controller - samples.loadbalancer.northbound - - - org.opendaylight.controller - samples.simpleforwarding - - - org.opendaylight.controller - security - - - org.opendaylight.controller - statistics.northbound - - - org.opendaylight.controller - statisticsmanager - - - org.opendaylight.controller - statisticsmanager.implementation - - - org.opendaylight.controller - subnets.northbound - - - org.opendaylight.controller - switchmanager - - - org.opendaylight.controller - switchmanager.implementation - - - org.opendaylight.controller - switchmanager.northbound - - - org.opendaylight.controller - topology.northbound - - - org.opendaylight.controller - topology.web - - - org.opendaylight.controller - topologymanager - - - org.opendaylight.controller - troubleshoot.web - - - org.opendaylight.controller - usermanager - - - org.opendaylight.controller - usermanager.implementation - - - org.opendaylight.controller - usermanager.northbound - - - - - - org.opendaylight.controller - web - - - org.opendaylight.controller.thirdparty - com.sun.jersey.jersey-servlet - - - - - org.opendaylight.controller.thirdparty - net.sf.jung2 - - - org.opendaylight.controller.thirdparty - org.openflow.openflowj - - - - org.ow2.asm - asm-all - - - - org.ow2.chameleon.management - chameleon-mbeans - - - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - log4j-over-slf4j - - - org.slf4j - slf4j-api - - - org.springframework - org.springframework.aop - - - - org.springframework - org.springframework.asm - - - org.springframework - org.springframework.beans - - - org.springframework - org.springframework.context - - - org.springframework - org.springframework.context.support - - - org.springframework - org.springframework.core - - - org.springframework - org.springframework.expression - - - org.springframework - org.springframework.transaction - - - org.springframework - org.springframework.web - - - org.springframework - org.springframework.web.servlet - - - - org.springframework.security - spring-security-config - - - org.springframework.security - spring-security-core - - - org.springframework.security - spring-security-taglibs - - - org.springframework.security - spring-security-web - - - virgomirror - org.eclipse.jdt.core.compiler.batch - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - unpack-provided-configs - - unpack-dependencies - - generate-resources - - ${project.build.directory}/configuration - sal-rest-connector-config,config-netty-config,md-sal-config,netconf-config,toaster-config,netconf-connector-config,sal-clustering-config - **\/*.xml,**/*.conf - true - false - - - - - - maven-assembly-plugin - 2.3 - - - distro-assembly - - single - - package - - - src/assemble/bin.xml - - ${project.artifactId} - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - **\/target\/,**\/bin\/,**\/target-ide\/,**\/configuration\/initial\/ - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 - - false - false - VersionUnknown - - - - - create - - validate - - - - - - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - - - - notduringrelease - - - !DOINGRELEASE - - - - - ${project.groupId} - ietf-netconf-monitoring - - - ${project.groupId} - ietf-netconf-monitoring-extension - - - commons-lang - commons-lang - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.xerces - 2.11.0_1 - - - org.bouncycastle - bcpkix-jdk15on - - - org.bouncycastle - bcprov-jdk15on - - - org.eclipse.birt.runtime.3_7_1 - org.apache.xml.resolver - 1.2.0 - - - org.opendaylight.controller - concepts - - - - - org.opendaylight.controller - config-api - - - org.opendaylight.controller - config-manager - - - org.opendaylight.controller - config-util - - - org.opendaylight.controller - config-netconf-connector - - - org.opendaylight.controller - config-persister-api - - - org.opendaylight.controller - config-persister-directory-xml-adapter - - - org.opendaylight.controller - config-persister-file-xml-adapter - - - org.opendaylight.controller - config-persister-impl - - - org.opendaylight.controller - filter-valve - - - org.opendaylight.controller - logback-config - - - - - org.opendaylight.controller - netconf-api - - - org.opendaylight.controller - netconf-client - - - - - org.opendaylight.controller - netconf-config-dispatcher - - - org.opendaylight.controller - netconf-impl - - - org.opendaylight.controller - netconf-mapping-api - - - org.opendaylight.controller - netconf-monitoring - - - org.opendaylight.controller - netconf-netty-util - - - org.opendaylight.controller - netconf-ssh - - - org.opendaylight.controller - netconf-auth - - - org.opendaylight.controller - netconf-usermanager - - - org.opendaylight.controller - netconf-tcp - - - org.opendaylight.controller - netconf-util - - - org.opendaylight.controller - netty-config-api - - - org.opendaylight.controller - netty-event-executor-config - - - org.opendaylight.controller - netty-threadgroup-config - - - org.opendaylight.controller - netty-timer-config - - - org.opendaylight.controller - protocol-framework - - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-binding-broker-impl - - - org.opendaylight.controller - sal-binding-config - - - org.opendaylight.controller - sal-binding-util - - - org.opendaylight.controller - sal-broker-impl - - - - org.opendaylight.controller - sal-common - - - org.opendaylight.controller - sal-common-api - - - org.opendaylight.controller - sal-common-impl - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.controller - sal-compatibility - - - org.opendaylight.controller - sal-connector-api - - - org.opendaylight.controller - sal-core-api - - - org.opendaylight.controller - sal-core-spi - - - org.opendaylight.controller - sal-inmemory-datastore - - - org.opendaylight.controller - sal-netconf-connector - - - org.opendaylight.controller - sal-remote - - - org.opendaylight.controller - sal-rest-connector - - - org.opendaylight.controller - sal-rest-connector-config - - - org.opendaylight.controller - config-netty-config - - - org.opendaylight.controller - md-sal-config - - - org.opendaylight.controller - netconf-config - - - org.opendaylight.controller - netconf-connector-config - - - org.opendaylight.controller.samples - toaster-config - - - org.opendaylight.controller - sal-rest-docgen - - - org.opendaylight.controller - sal-restconf-broker - - - - - org.opendaylight.controller - shutdown-api - - - org.opendaylight.controller - shutdown-impl - - - - - org.opendaylight.controller - threadpool-config-api - - - org.opendaylight.controller - threadpool-config-impl - - - org.opendaylight.controller - yang-jmx-generator - - - org.opendaylight.controller.md - forwardingrules-manager - - - org.opendaylight.controller.md - inventory-manager - - - org.opendaylight.controller.md - statistics-manager - - - org.opendaylight.controller.md - topology-lldp-discovery - - - org.opendaylight.controller - liblldp - - - org.opendaylight.controller.md - topology-manager - - - org.opendaylight.controller.model - model-flow-base - - - org.opendaylight.controller.model - model-flow-service - - - org.opendaylight.controller.model - model-flow-statistics - - - org.opendaylight.controller.model - model-inventory - - - org.opendaylight.controller.model - model-topology - - - - - org.opendaylight.controller.samples - sample-toaster - - - org.opendaylight.controller.samples - sample-toaster-consumer - - - org.opendaylight.controller.samples - sample-toaster-provider - - - org.apache.sshd - sshd-core - - - org.opendaylight.yangtools - binding-generator-api - - - org.opendaylight.yangtools - binding-generator-impl - - - org.opendaylight.yangtools - binding-data-codec - - - org.opendaylight.yangtools - binding-generator-spi - - - org.opendaylight.yangtools - binding-generator-util - - - org.opendaylight.yangtools - binding-model-api - - - org.opendaylight.yangtools - binding-type-provider - - - org.opendaylight.yangtools - concepts - - - org.opendaylight.yangtools - object-cache-api - - - org.opendaylight.yangtools - object-cache-guava - - - org.opendaylight.yangtools - restconf-client-api - - - org.opendaylight.yangtools - restconf-client-impl - - - org.opendaylight.yangtools - util - - - - org.opendaylight.yangtools - yang-binding - - - org.opendaylight.yangtools - yang-common - - - org.opendaylight.yangtools - yang-data-api - - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.yangtools - yang-data-util - - - org.opendaylight.yangtools - yang-model-api - - - org.opendaylight.yangtools - yang-model-util - - - org.opendaylight.yangtools - yang-parser-api - - - org.opendaylight.yangtools - yang-parser-impl - - - org.opendaylight.yangtools - yang-data-codec-gson - - - org.opendaylight.yangtools - yang-data-composite-node - - - - org.opendaylight.yangtools.model - ietf-inet-types - - - org.opendaylight.yangtools.model - ietf-restconf - - - org.opendaylight.yangtools.model - ietf-topology - - - org.opendaylight.yangtools.model - ietf-yang-types - - - org.opendaylight.yangtools.model - ietf-yang-types-20130715 - - - org.opendaylight.yangtools.model - opendaylight-l2-types - - - org.opendaylight.yangtools.model - yang-ext - - - - org.opendaylight.yangtools.thirdparty - antlr4-runtime-osgi-nohead - - - org.opendaylight.yangtools.thirdparty - xtend-lib-osgi - - - org.openexi - nagasena - - - org.openexi - nagasena-rta - - - org.zeromq - jeromq - 0.3.1 - - - org.opendaylight.controller - sal-clustering-config - - - org.eclipse.jetty - jetty-servlets - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-client - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-continuation - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-util - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-server - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-io - 8.1.14.v20131031 - - - org.eclipse.jetty - jetty-http - 8.1.14.v20131031 - - - - - integrationtests - - false - - - - org.opendaylight.controller - sanitytest - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - - org.opendaylight.controller - sanitytest - jar - - - - - - org.opendaylight.controller - sanitytest - ${sanitytest.version} - - - - - copy - - copy - - package - - - unpack-provided-configs - - unpack-dependencies - - generate-resources - - ${project.build.directory}/configuration - sal-rest-connector-config,config-netty-config,md-sal-config,netconf-config,toaster-config,netconf-connector-config,sal-clustering-config - **\/*.xml,**/*.conf - true - false - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - ${java.home}/bin/java - - -cp - ./target/dependency/* - org.opendaylight.controller.distribution.Sanity - - - ${java.home} - - - - - sanity-test - - exec - - package - - - - - - - - docs - - false - - - - org.opendaylight.controller - swagger-ui - 0.1.0-SNAPSHOT - - - - - diff --git a/opendaylight/distribution/opendaylight/runsanity.bat b/opendaylight/distribution/opendaylight/runsanity.bat deleted file mode 100644 index f219828bad..0000000000 --- a/opendaylight/distribution/opendaylight/runsanity.bat +++ /dev/null @@ -1,23 +0,0 @@ -rem Inject the sanitytest jar as a controller plugin -copy .\target\dependency\sanitytest*.jar .\target\distribution.opendaylight-osgipackage\opendaylight\plugins - -rem Store the current working directory in a variable so that we can get back to it later -set cwd=%cd% - -rem Switch to the distribution folder -cd .\target\distribution.opendaylight-osgipackage\opendaylight - -rem Run the controller -cmd.exe /c run.bat - -rem Store the exit value of the controller in a variable -set success=%ERRORLEVEL% - -rem Switch back to the directory from which this script was invoked -cd %cwd% - -rem Remove the sanitytest jar from the plugins directory -del .\target\distribution.opendaylight-osgipackage\opendaylight\plugins\sanitytest*.jar - -rem Exit using the exit code that we had captured earlier after running the controller -exit /b %SUCCESS% \ No newline at end of file diff --git a/opendaylight/distribution/opendaylight/runsanity.sh b/opendaylight/distribution/opendaylight/runsanity.sh deleted file mode 100755 index 4ee9555b97..0000000000 --- a/opendaylight/distribution/opendaylight/runsanity.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Inject the sanitytest jar as a controller plugin -cp ./target/dependency/sanitytest*.jar ./target/distribution.opendaylight-osgipackage/opendaylight/plugins - -# Store the current working directory in a variable so that we can get back to it later -cwd=`pwd` - -# Switch to the distribution folder -cd ./target/distribution.opendaylight-osgipackage/opendaylight/ - -# Run the controller -./run.sh - -# Store the exit value of the controller in a variable -success=`echo $?` - -# Switch back to the directory from which this script was invoked -cd $cwd - -# Remove the sanitytest jar from the plugins directory -rm ./target/distribution.opendaylight-osgipackage/opendaylight/plugins/sanitytest*.jar - -# Exit using the exit code that we had captured earlier after running the controller -exit $success - diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml deleted file mode 100644 index e5fc98a863..0000000000 --- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml +++ /dev/null @@ -1,98 +0,0 @@ - - osgipackage - - dir - zip - - false - - - opendaylight/plugins - - equinoxSDK381:org.eclipse.osgi - equinoxSDK381:org.eclipse.equinox.console - equinoxSDK381:org.eclipse.equinox.launcher - equinoxSDK381:org.eclipse.equinox.ds - equinoxSDK381:org.eclipse.equinox.util - equinoxSDK381:org.eclipse.osgi.services - virgomirror:org.eclipse.jdt.core.compiler.batch - org.apache.felix:org.apache.felix.fileinstall - geminiweb:org.eclipse.virgo.kernel.equinox.extensions - org.slf4j:slf4j-api - ch.qos.logback:logback-core - ch.qos.logback:logback-classic - com.sun.jersey:jersey-core - com.sun.jersey:jersey-server - org.opendaylight.controller:logging.bridge - org.opendaylight.controller:sanitytest - - - ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} - - false - runtime - false - - - opendaylight/lib - - equinoxSDK381:org.eclipse.osgi - equinoxSDK381:org.eclipse.equinox.console - equinoxSDK381:org.eclipse.equinox.launcher - equinoxSDK381:org.eclipse.equinox.ds - equinoxSDK381:org.eclipse.equinox.util - equinoxSDK381:org.eclipse.osgi.services - virgomirror:org.eclipse.jdt.core.compiler.batch - org.apache.felix:org.apache.felix.fileinstall - geminiweb:org.eclipse.virgo.kernel.equinox.extensions - org.slf4j:slf4j-api - ch.qos.logback:logback-core - ch.qos.logback:logback-classic - com.sun.jersey:jersey-core - com.sun.jersey:jersey-server - org.opendaylight.controller:logging.bridge - - false - - ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension} - - false - runtime - - - - - - src/main/resources/ - - - version.properties - configuration/config.ini - - - opendaylight/ - - - - ${project.build.directory}/configuration/initial - /opendaylight/configuration/initial - - **/META-INF/** - - - - - - src/main/resources/version.properties - opendaylight - true - - - src/main/resources/configuration/config.ini - opendaylight/configuration - true - - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini deleted file mode 100644 index 691d83d45e..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ /dev/null @@ -1,163 +0,0 @@ -osgi.bundles=\ - reference\:file\:../lib/org.apache.felix.fileinstall-3.1.6.jar@1:start,\ - reference\:file\:../lib/org.eclipse.jdt.core.compiler.batch-3.8.0.I20120518-2145.jar@1:start,\ - reference\:file\:../lib/org.eclipse.equinox.ds-1.4.0.v20120522-1841.jar@2:start,\ - reference\:file\:../lib/org.eclipse.equinox.util-1.0.400.v20120522-2049.jar@2:start,\ - reference\:file\:../lib/org.eclipse.osgi.services-3.3.100.v20120522-1822@2:start,\ - reference\:file\:../lib/org.eclipse.equinox.console-1.0.0.v20120522-1841.jar@start,\ - reference\:file\:../lib/slf4j-api-1.7.2.jar@1:start,\ - reference\:file\:../lib/logback-classic-1.0.9.jar@1:start,\ - reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\ - reference\:file\:../lib/logging.bridge-${logging.bridge.version}@1:start,\ - reference\:file\:../lib/jersey-core-1.17.jar@2:start,\ - reference\:file\:../lib/jersey-server-1.17.jar@2:start - -# Netconf startup configuration - -# Netconf tcp address:port is optional -#netconf.tcp.address=127.0.0.1 -#netconf.tcp.port=8383 - -# Netconf tcp address:port is optional -netconf.ssh.address=0.0.0.0 -netconf.ssh.port=1830 -netconf.ssh.pk.path = ./configuration/RSA.pk -netconf.ssh.default.user = netconf -netconf.ssh.default.password = netconf - - -netconf.config.persister.active=1,2 -# read startup configuration -netconf.config.persister.1.storageAdapterClass=org.opendaylight.controller.config.persist.storage.directory.xml.XmlDirectoryStorageAdapter -netconf.config.persister.1.properties.directoryStorage=configuration/initial/ -# include only xml files, files with other extensions will be skipped, multiple extensions are permitted e.g. netconf.config.persister.1.properties.includeExtensions=xml,cfg,config -netconf.config.persister.1.properties.includeExtensions=xml -netconf.config.persister.1.readonly=true - -netconf.config.persister.2.storageAdapterClass=org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter -netconf.config.persister.2.properties.fileStorage=configuration/current/controller.currentconfig.xml -netconf.config.persister.2.properties.numberOfBackups=1 - -# Set Default start level for framework -osgi.bundles.defaultStartLevel=4 -# Extra packages to import from the boot class loader -org.osgi.framework.system.packages.extra=sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch -# This is not Eclipse App -eclipse.ignoreApp=true -# Don't shutdown equinox if the eclipse App has ended, -# which is our case because we are not running any eclipse application -osgi.noShutdown=true -# Clean any cached data on restart of the framework -osgi.clean=true - -# https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578 -# Extend the framework to avoid the resources to be presented with -# a URL of type bundleresource: but to be presented as file: -osgi.hook.configurators.include=org.eclipse.virgo.kernel.equinox.extensions.hooks.ExtensionsHookConfigurator - -# Directory from where the fileinstall will monitor for new bundles -felix.fileinstall.dir=./plugins -# Immediately learn new bundles at startup -felix.fileinstall.noInitialDelay=true -# Auto start the bundles at level 4 -felix.fileinstall.start.level=4 -# Avoid to auto-install following bundles, that means those need -# to be started manually or in other way like osgi.bundles -felix.fileinstall.filter=^(?!org.apache.felix.fileinstall).* - -# logback configuration -logback.configurationFile=configuration/logback.xml - -# Container configuration -container.profile = Container - -# Connection manager configuration -connection.scheme = ANY_CONTROLLER_ONE_MASTER - -# Embedded Tomcat configuration File -org.eclipse.gemini.web.tomcat.config.path=configuration/tomcat-server.xml -org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true - -# Open Flow related system parameters -# TCP port on which the controller is listening (default 6633) -# of.listenPort=6633 -# IP address of the controller (default: wild card) -# of.address = 127.0.0.1 -# The time (in milliseconds) the controller will wait for a response after sending a Barrier Request or a Statistic Request message (default 2000 msec) -# of.messageResponseTimer=2000 -# The switch liveness timeout value (default 60500 msec) -# of.switchLivenessTimeout=60500 -# The size of the queue holding pending statistics requests (default 64). For large networks of n switches, it is recommended to set the queue size to n -# of.statsQueueSize = 64 -# The flow statistics polling interval in second (default 10 sec) -# of.flowStatsPollInterval=10 -# The port statistics polling interval in second (default 5 sec) -# of.portStatsPollInterval=5 -# The description statistics polling interval in second (default 60 sec) -# of.descStatsPollInterval=60 -# The table statistics polling interval in second (default 10 sec) -# of.tableStatsPollInterval=10 -# The maximum number of asynchronous messages can be sent before sending a Barrier Request (default 100) -# of.barrierMessagePriorCount=100 -# The interval which determines how often the discovery packets should be sent (default 300 sec) -# of.discoveryInterval=300 -# The timeout multiple of discovery interval -# of.discoveryTimeoutMultiple=2 -# For newly added ports, allow one more retry if the elapsed time exceeds this threshold (default 30 sec) -# of.discoveryThreshold=30 -# The maximum number of ports handled in one discovery batch (default 512) -# of.discoveryBatchMaxPorts=512 - -# OVSDB configuration -# ovsdb plugin supports both active and passive connections. It listens on port 6640 by default for Active connections. -ovsdb.listenPort=6640 - -# ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version. -# default Openflow version = 1.3, we also support 1.0. -ovsdb.of.version=1.3 - -# ovsdb can be configured with ml2 to perform l3 forwarding. The config below enables that functionality, which is -# disabled by default. -# ovsdb.l3.fwd.enabled=yes - -# ovsdb can be configured with ml2 to perform l3 forwarding. When used in that scenario, the mac address of the default -# gateway --on the external subnet-- is expected to be resolved from its inet address. The config below overrides that -# specific arp/neighDiscovery lookup. -# ovsdb.l3gateway.mac=00:00:5E:00:02:01 - -# TLS configuration -# To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. -# The Java KeyStore contains controller's private key and certificate. The Java TrustStore contains the trusted certificate -# entries, including switches' Certification Authority (CA) certificates. For example, -# secureChannelEnabled=true -# controllerKeyStore=./configuration/ctlKeyStore -# controllerKeyStorePassword=xxxxxxxx (this password should match the password used for KeyStore generation and at least 6 characters) -# controllerTrustStore=./configuration/ctlTrustStore -# controllerTrustStorePassword=xxxxxxxx (this password should match the password used for TrustStore generation and at least 6 characters) - -secureChannelEnabled=false -controllerKeyStore= -controllerKeyStorePassword= -controllerTrustStore= -controllerTrustStorePassword= - -# User Manager configurations -enableStrongPasswordCheck = false - -#Jolokia configurations -org.jolokia.listenForHttpService=false - -# Logging configuration for Tomcat-JUL logging -java.util.logging.config.file=configuration/tomcat-logging.properties - -#Hosttracker hostsdb key scheme setting -hosttracker.keyscheme=IP - -# LISP Flow Mapping configuration -# Map-Register messages overwrite existing RLOC sets in EID-to-RLOC mappings -lisp.mappingOverwrite = true -# Enable the Solicit-Map-Request (SMR) mechanism -lisp.smr = false - -#RESTConf websocket listen port (default is 8181) -restconf.websocket.port=8181 diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/context.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/context.xml deleted file mode 100644 index 90b9ddf1c8..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/context.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml deleted file mode 100644 index c148b83a7a..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - CorsFilter - org.apache.catalina.filters.CorsFilter - - cors.allowed.origins - * - - - cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT,DELETE - - - cors.allowed.headers - Content-Type,X-Requested-With,accept,authorization, - origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers - - - - cors.exposed.headers - Access-Control-Allow-Origin,Access-Control-Allow-Credentials - - - cors.support.credentials - true - - - cors.preflight.maxage - 10 - - - - - - CorsFilter - - - - - CorsFilter - /* - - - - - - CorsFilter - - - - - CorsFilter - /* - - - - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml deleted file mode 100644 index b73244bc0a..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{36} %X{akkaSource} - %msg%n - - - - logs/opendaylight.log - - - logs/opendaylight.%d.log.zip - 1 - - - - 10MB - - - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} [%thread] %-5level %logger{35} - %msg%n - - - - logs/audit.log - true - - %date{"yyyy-MM-dd HH:mm:ss.SSS z"} %msg %n - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/startup/README b/opendaylight/distribution/opendaylight/src/main/resources/configuration/startup/README deleted file mode 100644 index 2da70fff1e..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/startup/README +++ /dev/null @@ -1 +0,0 @@ -Directory where the opendaylight controller modules store their configuration files diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-logging.properties b/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-logging.properties deleted file mode 100644 index 3dbd9921b3..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-logging.properties +++ /dev/null @@ -1,42 +0,0 @@ -############################################################ -# Configuration file for tomcat logging -############################################################ -# Handlers: -# "handlers" specifies a comma separated list of log Handler -# classes. These handlers will be installed during VM startup. -# Note that these classes must be on the system classpath. -# Following line configures a ConsoleHandler and a FileHandler - -handlers= java.util.logging.FileHandler,java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties -# Describes specific configuration info for Handlers -# JUL does not support rolling file handler based on date -# For now we will keep count of files to 5 with rolling size of 10MB -############################################################ - -java.util.logging.FileHandler.pattern = logs/tomcat%g.log -java.util.logging.FileHandler.limit = 104857600 -java.util.logging.FileHandler.count = 5 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.append = true -java.util.logging.FileHandler.level = INFO - -# Limit the message that are printed on the console to SEVERE and above. -java.util.logging.ConsoleHandler.level = WARNING -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -# SimpleFormatter output format to print one-line log message like this: -# --
:: [] > -# -java.util.logging.SimpleFormatter.format=%1$tF %1$tT %1$tZ [%3$s] %4$s %2$s %5$s%6$s%n - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages -#org.apache.catalina = SEVERE diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml deleted file mode 100644 index da2500be62..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/tomcat-server.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/functions.sh b/opendaylight/distribution/opendaylight/src/main/resources/functions.sh deleted file mode 100644 index 21dd4c16ba..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/functions.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Function harvestHelp searches in run.sh part for line starting with "##". -# Next lines starting with "#" will be printed without first char # (=help content). -# Help content has to end with "##" on new line. -# Example: -##foo -# Foo is world wide used synnonym for bar. -## -function harvestHelp() { - key="$1" - if [ -z "${key}" ]; then - key='HELP' - fi - echo - sed -rn "/^##${key}$/,/^##/ p" $0 | sed -r '1 d; $ d; s/^#/ /' - grep "##${key}" $0 > /dev/null -} diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.bat b/opendaylight/distribution/opendaylight/src/main/resources/run.bat deleted file mode 100644 index ce13e33968..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/run.bat +++ /dev/null @@ -1,280 +0,0 @@ -@ECHO OFF -SETLOCAL ENABLEDELAYEDEXPANSION - -IF NOT EXIST "%JAVA_HOME%" ( - ECHO JAVA_HOME environment variable is not set - EXIT /B 2 -) - -SET basedir=%~dp0 -SET debugport=8000 -SET consoleport=2400 -SET jmxport=1088 -SET jvmMaxMemory= -SET extraJVMOpts= -SET consoleOpts=-console -consoleLog -SET PID= -SET JAVA_H=%JAVA_HOME%\bin\jps.exe - -:LOOP -IF "%~1" NEQ "" ( - SET CARG=%~1 - IF "!CARG!"=="-debug" ( - SET debugEnabled=true - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-debugsuspend" ( - SET debugEnabled=true - SET debugSuspended=true - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-debugport" ( - SET debugEnabled=true - SET debugport=%~2 - SHIFT & SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-jmx" ( - SET jmxEnabled=true - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-jmxport" ( - SET jmxEnabled=true - SET jmxport=%~2 - SHIFT & SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-start" ( - SET startEnabled=true - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-consoleport" ( - SET consoleport=%~2 - SHIFT & SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-console" ( - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-status" ( - for /F "TOKENS=1" %%G in ('""!JAVA_H!" -lvV ^| find /I "opendaylight""') do ( - set PID=%%G - ) - if "!PID!" NEQ "" ( - ECHO Controller is running with PID !PID! - ) else ( - ECHO Controller is not running. - ) - GOTO :EOF - ) - IF "!CARG!"=="-stop" ( - for /F "TOKENS=1" %%G in ('""!JAVA_H!" -lvV ^| find /I "opendaylight""') do ( - set PID=%%G - ) - if "!PID!" NEQ "" ( - ECHO Stopping controller PID !PID! - TASKKILL /F /PID !PID! - ) else ( - ECHO Controller is not running. - ) - GOTO :EOF - ) - IF "!CARG:~0,4!"=="-Xmx" ( - SET jvmMaxMemory=!CARG! - SHIFT - GOTO :LOOP - ) - IF "!CARG:~0,2!"=="-D" ( - SET extraJVMOpts=!extraJVMOpts! !CARG! - SHIFT - GOTO :LOOP - ) - IF "!CARG:~0,2!"=="-X" ( - SET extraJVMOpts=!extraJVMOpts! !CARG! - SHIFT - GOTO :LOOP - ) - IF "!CARG!"=="-help" ( - SHIFT - SET CARG=%2 - IF "!CARG!" NEQ "" ( - CALL:!CARG! - ) ELSE ( - CALL:helper - ) - GOTO :EOF - ) - - ECHO "Unknown option: !CARG!" - EXIT /B 1 -) - -IF "%debugEnabled%" NEQ "" ( - REM ECHO "DEBUG enabled" - SET extraJVMOpts=!extraJVMOpts! -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=%debugport% -) - -IF "%debugSuspended%" NEQ "" ( - REM ECHO "DEBUG enabled suspended" - SET extraJVMOpts=!extraJVMOpts! -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=%debugport% -) - -IF "%jvmMaxMemory%"=="" ( - SET jvmMaxMemory=-Xmx1G - ECHO Setting maximum memory to 1G. -) - -SET extraJVMOpts=!extraJVMOpts! %jvmMaxMemory% - -IF "%jmxEnabled%" NEQ "" ( - REM ECHO "JMX enabled " - SET extraJVMOpts=!extraJVMOpts! -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=%jmxport% -Dcom.sun.management.jmxremote -) -IF "%startEnabled%" NEQ "" ( - REM ECHO "START enabled " - SET consoleOpts=-console %consoleport% -consoleLog -) - -REM Check if controller is already running -for /F "TOKENS=1" %%G in ('""!JAVA_H!" -lvV ^| find /I "opendaylight""') do ( - SET PID=%%G -) -if "!PID!" NEQ "" ( - ECHO Controller is already running with PID !PID! - EXIT /B 1 -) - - -REM Now set the classpath: -SET cp="%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar;%basedir%lib\org.eclipse.virgo.kernel.equinox.extensions-3.6.0.RELEASE.jar;%basedir%lib\org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar" - -REM Now set framework classpath -SET fwcp="file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar,file:\%basedir%lib\org.eclipse.virgo.kernel.equinox.extensions-3.6.0.RELEASE.jar,file:\%basedir%lib\org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar" - -SET RUN_CMD="%JAVA_HOME%\bin\java.exe" -Dopendaylight.controller !extraJVMOpts! -Djava.io.tmpdir="%basedir%work\tmp" -Djava.awt.headless=true -Dosgi.install.area=%basedir% -Dosgi.configuration.area="%basedir%configuration" -Dosgi.frameworkClassPath=%fwcp% -Dosgi.framework="file:\%basedir%lib\org.eclipse.osgi-3.8.1.v20120830-144521.jar" -classpath %cp% org.eclipse.equinox.launcher.Main %consoleOpts% - -ECHO !RUN_CMD! - -if "%startEnabled%" NEQ "" ( - START /B cmd /C CALL !RUN_CMD! > %basedir%\logs\controller.out 2>&1 - ECHO Running controller in the background. - EXIT /B 1 -) else ( - !RUN_CMD! - EXIT /B %ERRORLEVEL% -) - -:helper -echo. For more information on a specific command, type -help command-name. -echo. -echo jmx ^[-jmx^] -echo jmxport ^[-jmxport ^^] - DEFAULT is 1088 -echo debug ^[-debug^] -echo debugsuspend ^[-debugsuspend^] -echo debugport ^[-debugport ^^] - DEFAULT is 8000 -echo start ^[-start ^[^^]^] - DEFAULT port is 2400 -echo stop ^[-stop^] -echo status ^[-status^] -echo console ^[-console^] -echo agentpath ^[-agentpath:^^] -exit/B 1 - -:debugsuspend -ECHO. -ECHO. debugsuspend ^[-debugsuspend^] -ECHO. -ECHO. This command sets suspend on true in runjdwp in extra JVM options. If its true, VMStartEvent has a suspendPolicy of SUSPEND_ALL. If its false, VMStartEvent has a suspendPolicy of SUSPEND_NONE. -ECHO. -EXIT /B 1 - -:debugport -ECHO. -ECHO. debugport ^[-debugport ^^] - DEFAULT is 8000 -ECHO. -ECHO. Set address for settings in runjdwp in extra JVM options. -ECHO. The address is transport address for the connection. -ECHO. The address has to be in the range ^[1024,65535^]. If the option was not call, port will be set to default value. -ECHO. -EXIT /B 1 - -:jmxport -ECHO. -ECHO. jmxport ^[-jmxport ^^] - DEFAULT is 1088 -ECHO. -ECHO. Set jmx port for com.sun.management.jmxremote.port in JMX support. Port has to be in the range ^[1024,65535^]. If this option was not call, port will be set to default value. -ECHO. -EXIT /B 1 - -:debug -ECHO. -ECHO. debug [-debug] -ECHO. -ECHO. Run ODL controller with -Xdebug and -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=^$^{debugport^} -ECHO. -ECHO. -Xdebug enables debugging capabilities in the JVM which are used by the Java Virtual Machine Tools Interface (JVMTI). JVMTI is a low-level debugging interface used by debuggers and profiling tools. -ECHO. -ECHO. -Xrunjdwp option loads the JPDA reference implementation of JDWP. This library resides in the target VM and uses JVMDI and JNI to interact with it. It uses a transport and the JDWP protocol to communicate with a separate debugger application. -ECHO. -ECHO. settings for -Xrunjdwp: -ECHO. transport - name of the transport to use in connecting to debugger application -ECHO. server - if 'y', listen for a debugger application to attach; otherwise, attach to the debugger application at the specified address -ECHO. - if 'y' and no address is specified, choose a transport address at which to listen for a debugger application, and print the address to the standard output stream -ECHO. suspend - if 'y', VMStartEvent has a suspend Policy of SUSPEND_ALL -ECHO. - if 'n', VMStartEvent has a suspend policy of SUSPEND_NONE -ECHO. address - transport address for the connection -ECHO. - if server=n, attempt to attach to debugger application at this address -ECHO. - if server=y, listen for a connection at this address -ECHO. -EXIT /B 1 - -:jmx -ECHO. -ECHO. jmx [-jmx] -ECHO. -ECHO. Add JMX support. With settings for extra JVM options: -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=^$^{jmxport^} -Dcom.sun.management.jmxremote -ECHO. jmxport can by set with option -jmxport ^. Default num for the option is 1088. -ECHO. -EXIT /B 1 - -:stop -ECHO. -ECHO. stop ^[-stop^] -ECHO. -ECHO. If a controller is running, the command stop controller. Pid will be clean. -ECHO. -EXIT /B 1 - -:status -ECHO. -ECHO. status ^[-status^] -ECHO. -ECHO. Find out whether a controller is running and print it. -ECHO. -EXIT /B 1 - -:start -ECHO. -ECHO. start ^[-start ^[^^]^] -ECHO. -ECHO. If controller is not running, the command with argument^(for set port, where controller has start^) will start new controller on a port. The port has to be in the range ^[1024,65535^]. If this option was not call, port will be set to default value. Pid will be create. -EXIT /B 1 - -:console -ECHO. -ECHO. console [-console] -ECHO. Default option. -EXIT /B 1 - -:agentpath -ECHO. -ECHO. agentpath ^[-agentpath:^^] -ECHO. -ECHO. Agentpath option passes path to agent to jvm in order to load native agent library, e.g. yourkit profiler agent. -EXIT /B 1 - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/run.sh b/opendaylight/distribution/opendaylight/src/main/resources/run.sh deleted file mode 100755 index b032469b7f..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/run.sh +++ /dev/null @@ -1,331 +0,0 @@ -#!/bin/bash - -##HELP -# For more information on a specific command, type -help command-name. -# -# jmx [-jmx] -# jmxport [-jmxport ] - DEFAULT is 1088 -# debug [-debug] -# debugsuspend [-debugsuspend] -# debugport [-debugport ] - DEFAULT is 8000 -# start [-start []] - DEFAULT port is 2400 -# stop [-stop] -# status [-status] -# console [-console] -# agentpath [-agentpath:] -## - -platform='unknown' -unamestr=`uname` -if [[ "$unamestr" == 'Linux' ]]; then - platform='linux' -elif [[ "$unamestr" == 'Darwin' ]]; then - platform='osx' -fi - -if [[ $platform == 'linux' ]]; then - fullpath=`readlink -f $0` - - if [[ -z ${JAVA_HOME} ]]; then - # Find the actual location of the Java launcher: - java_launcher=`command -v java` - java_launcher=`readlink -f "${java_launcher}"` - - # Compute the Java home from the location of the Java launcher: - export JAVA_HOME="${java_launcher%/bin/java}" - fi -elif [[ $platform == 'osx' ]]; then - TARGET_FILE=$0 - cd `dirname "$TARGET_FILE"` - TARGET_FILE=`basename $TARGET_FILE` - - # Iterate down a (possible) chain of symlinks - while [ -L "$TARGET_FILE" ] - do - TARGET_FILE=`readlink "$TARGET_FILE"` - cd `dirname "$TARGET_FILE"` - TARGET_FILE=`basename "$TARGET_FILE"` - done - - # Compute the canonicalized name by finding the physical path - # for the directory we're in and appending the target file. - PHYS_DIR=`pwd -P` - RESULT=$PHYS_DIR/$TARGET_FILE - fullpath=$RESULT - - [[ -z ${JAVA_HOME} ]] && [[ -x "/usr/libexec/java_home" ]] && export JAVA_HOME=`/usr/libexec/java_home -v 1.7`; - -fi - -[[ -z ${JAVA_HOME} ]] && echo "Need to set JAVA_HOME environment variable" && exit -1; -[[ ! -x ${JAVA_HOME}/bin/java ]] && echo "Cannot find an executable \ -JVM at path ${JAVA_HOME}/bin/java check your JAVA_HOME" && exit -1; - -if [ -z ${ODL_BASEDIR} ]; then - basedir=`dirname "${fullpath}"` -else - basedir=${ODL_BASEDIR} -fi - -if [ -z ${ODL_DATADIR} ]; then - datadir=`dirname "${fullpath}"` -else - datadir=${ODL_DATADIR} -fi - -if [ -z ${TMP} ]; then - pidfile="/tmp/opendaylight.PID" -else - pidfile="${TMP}/opendaylight.PID" -fi -debug=0 -debugsuspend=0 -debugport=8000 -debugportread="" -startdaemon=0 -daemonport=2400 -daemonportread="" -jmxport=1088 -jmxportread="" -startjmx=0 -stopdaemon=0 -statusdaemon=0 -consolestart=1 -dohelp=0 -jvmMaxMemory="-Xmx1G" -extraJVMOpts="" -agentPath="" -unknown_option=0 -helper="" -while true ; do - case "$1" in - -debug) debug=1; shift ;; - -help) dohelp=1; shift; helper=$1; break ;; - -jmx) startjmx=1; shift ;; - -debugsuspend) debugsuspend=1; shift ;; - -debugport) shift; debugportread="$1"; if [[ "${debugportread}" =~ ^[0-9]+$ ]] ; then debugport=${debugportread}; shift; else echo "-debugport expects a number but was not found"; exit -1; fi;; - -jmxport) shift; jmxportread="$1"; if [[ "${jmxportread}" =~ ^[0-9]+$ ]] ; then jmxport=${jmxportread}; shift; else echo "-jmxport expects a number but was not found"; exit -1; fi;; - -start) startdaemon=1; shift; daemonportread="$1"; if [[ "${daemonportread}" =~ ^[0-9]+$ ]] ; then daemonport=${daemonportread}; shift; fi;; - -stop) stopdaemon=1; shift ;; - -status) statusdaemon=1; shift ;; - -console) shift ;; - -Xmx*) jvmMaxMemory="$1"; shift;; - -D*) extraJVMOpts="${extraJVMOpts} $1"; shift;; - -X*) extraJVMOpts="${extraJVMOpts} $1"; shift;; - -J*) extraJVMOpts="${extraJVMOpts} -$(echo "$1" | cut -d'J' -f2)"; shift;; - -agentpath:*) agentPath="$1"; shift;; - "") break ;; - *) echo "Unknown option $1"; unknown_option=1; break ;; - esac -done - - - -if [ "${unknown_option}" -eq 1 ]; then - echo "Use -help for more information." - exit 1 -fi - - -if [ "${dohelp}" -eq 1 ]; then - . ${basedir}/functions.sh - harvestHelp ${helper} - echo -e '\nFor other information type -help.\n' - exit 1 -fi - -extraJVMOpts="${extraJVMOpts} ${jvmMaxMemory}" - -##debugport -#debugport [-debugport ] - DEFAULT is 8000 -# -# Set address for settings in runjdwp in extra JVM options. -# The address is transport address for the connection. -# The address has to be in the range [1024,65535]. If this option was not call, port will be set to default value. -## -# Validate debug port -if [[ "${debugport}" -lt 1024 ]] || [[ "${debugport}" -gt 65535 ]]; then - echo "Debug Port not in the range [1024,65535] ${debugport}" - exit -1 -fi - -# Validate daemon console port -if [[ "${daemonport}" -lt 1024 ]] || [[ "${daemonport}" -gt 65535 ]]; then - echo "Daemon console Port not in the range [1024,65535] value is ${daemonport}" - exit -1 -fi - -##jmxport -#jmxport [-jmxport ] - DEFAULT is 1088 -# -# Set jmx port for com.sun.management.jmxremote.port in JMX support. Port has to be in the range [1024,65535]. If this option was not call, port will be set to default value. -## -# Validate jmx port -if [[ "${jmxport}" -lt 1024 ]] || [[ "${jmxport}" -gt 65535 ]]; then - echo "JMX Port not in the range [1024,65535] value is ${jmxport}" - exit -1 -fi -##debug -#debug [-debug] -# -#Run ODL controller with -Xdebug and -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=\${debugport} -#-Xdebug enables debugging capabilities in the JVM which are used by the Java Virtual Machine Tools Interface (JVMTI). JVMTI is a low-level debugging interface used by debuggers and profiling tools. -#-Xrunjdwp option loads the JPDA reference implementation of JDWP. This library resides in the target VM and uses JVMDI and JNI to interact with it. It uses a transport and the JDWP protocol to -#communicate with a separate debugger application. -#settings for -Xrunjdwp: -# transport - name of the transport to use in connecting to debugger application -# server - if “y”, listen for a debugger application to attach; otherwise, attach to the debugger application at the specified address -# - if “y” and no address is specified, choose a transport address at which to listen for a debugger application, and print the address to the standard output stream -# suspend - if “y”, VMStartEvent has a suspend Policy of SUSPEND_ALL -# - if “n”, VMStartEvent has a suspend policy of SUSPEND_NONE -# address - transport address for the connection -# - if server=n, attempt to attach to debugger application at this address -# - if server=y, listen for a connection at this address -## - -##debugsuspend -#debugsuspend [-debugsuspend] -# -#This command sets suspend on true in runjdwp in extra JVM options. If its true, VMStartEvent has a suspendPolicy of SUSPEND_ALL. If its false, VMStartEvent has a suspendPolicy of SUSPEND_NONE. -## -# Debug options -if [ "${debugsuspend}" -eq 1 ]; then - extraJVMOpts="${extraJVMOpts} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debugport}" -elif [ "${debug}" -eq 1 ]; then - extraJVMOpts="${extraJVMOpts} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=${debugport}" -fi -##jmx -#jmx [-jmx] -# -#Add JMX support. With settings for extra JVM options: -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=\${jmxport} -Dcom.sun.management.jmxremote -#jmxport can by set with command -jmxport . Default num for the option is 1088. -## -# Add JMX support -if [ "${startjmx}" -eq 1 ]; then - extraJVMOpts="${extraJVMOpts} -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.port=${jmxport} -Dcom.sun.management.jmxremote" -fi - -######################################## -# Now add to classpath the OSGi JAR -######################################## -CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar -FWCLASSPATH=file:"${basedir}"/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar - -######################################## -# Now add the extensions -######################################## - -# Extension 1: this is used to be able to convert all the -# bundleresouce: URL in file: so packages that are not OSGi ready can -# still work. Notably this is the case for spring classes -CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.RELEASE.jar -FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.virgo.kernel.equinox.extensions-3.6.0.RELEASE.jar - -######################################## -# Now add the launcher -######################################## -CLASSPATH=${CLASSPATH}:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar -FWCLASSPATH=${FWCLASSPATH},file:${basedir}/lib/org.eclipse.equinox.launcher-1.3.0.v20120522-1813.jar - -cd $basedir - -##stop -#stop [-stop] -# -#If a controller is running, the command stop controller. Pid will be clean. -## -if [ "${stopdaemon}" -eq 1 ]; then - if [ -e "${pidfile}" ]; then - daemonpid=`cat "${pidfile}"` - kill "${daemonpid}" - rm -f "${pidfile}" - echo "Controller with PID: ${daemonpid} -- Stopped!" - exit 0 - else - echo "Doesn't seem any Controller daemon is currently running" - exit -1 - fi -fi - -##status -#status [-status] -# -#Find out whether a controller is running and print it. -## -if [ "${statusdaemon}" -eq 1 ]; then - if [ -e "${pidfile}" ]; then - daemonpid=`cat "${pidfile}"` - ps -p ${daemonpid} > /dev/null - daemonexists=$? - if [ "${daemonexists}" -eq 0 ]; then - echo "Controller with PID: ${daemonpid} -- Running!" - exit 0 - else - echo "Controller with PID: ${daemonpid} -- Doesn't seem to exist" - rm -f "${pidfile}" - exit 1 - fi - else - echo "Doesn't seem any Controller daemon is currently running, at least no PID file has been found" - exit -1 - fi -fi - -iotmpdir=`echo "${datadir}" | sed 's/ /\\ /g'` -bdir=`echo "${basedir}" | sed 's/ /\\ /g'` -confarea=`echo "${datadir}" | sed 's/ /\\ /g'` -fwclasspath=`echo "${FWCLASSPATH}" | sed 's/ /\\ /g'` - -##start -#start [-start []] -# -# If controller is not running, the command with argument(for set port, where controller has start) will start new controller on a port. The port has to be in the range [1024,65535]. If this option was not call, port will be set to default value. Pid will be create. -## -##console -#console [-console] -# -# Default option. -## -##agentpath -#agentpath [-agentpath:] -# -# Agentpath option passes path to agent to jvm in order to load native agent library, e.g. yourkit profiler agent. -## -echo "JVM maximum memory was set to ${jvmMaxMemory}." -if [ "${startdaemon}" -eq 1 ]; then - if [ -e "${pidfile}" ]; then - echo "Another instance of controller running, check with $0 -status" - exit -1 - fi - $JAVA_HOME/bin/java ${extraJVMOpts} \ - ${agentPath} \ - -Djava.io.tmpdir="${iotmpdir}/work/tmp" \ - -Dosgi.install.area="${bdir}" \ - -Dosgi.configuration.area="${confarea}/configuration" \ - -Dosgi.frameworkClassPath="${fwclasspath}" \ - -Dosgi.framework=file:"${bdir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar" \ - -Djava.awt.headless=true \ - -classpath "${CLASSPATH}" \ - org.eclipse.equinox.launcher.Main \ - -console ${daemonport} \ - -consoleLog & - daemonpid=$! - echo ${daemonpid} > ${pidfile} -elif [ "${consolestart}" -eq 1 ]; then - if [ -e "${pidfile}" ]; then - echo "Another instance of controller running, check with $0 -status" - exit -1 - fi - $JAVA_HOME/bin/java ${extraJVMOpts} \ - ${agentPath} \ - -Djava.io.tmpdir="${iotmpdir}/work/tmp" \ - -Dosgi.install.area="${bdir}" \ - -Dosgi.configuration.area="${confarea}/configuration" \ - -Dosgi.frameworkClassPath="${fwclasspath}" \ - -Dosgi.framework=file:"${bdir}/lib/org.eclipse.osgi-3.8.1.v20120830-144521.jar" \ - -Djava.awt.headless=true \ - -classpath "${CLASSPATH}" \ - org.eclipse.equinox.launcher.Main \ - -console \ - -consoleLog -fi diff --git a/opendaylight/distribution/opendaylight/src/main/resources/version.properties b/opendaylight/distribution/opendaylight/src/main/resources/version.properties deleted file mode 100644 index 90af49dfc2..0000000000 --- a/opendaylight/distribution/opendaylight/src/main/resources/version.properties +++ /dev/null @@ -1,6 +0,0 @@ -org.opendaylight.controller.version = 0.1 -org.opendaylight.controller.build.scm.version = ${buildNumber} -org.opendaylight.controller.build.user = ${env.USER} -org.opendaylight.controller.build.workspace = ********** -org.opendaylight.controller.build.timestamp = ${timestamp} -org.opendaylight.controller.build.machine = ********** diff --git a/opendaylight/distribution/sanitytest/pom.xml b/opendaylight/distribution/sanitytest/pom.xml deleted file mode 100644 index 9955afa274..0000000000 --- a/opendaylight/distribution/sanitytest/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.5.0-SNAPSHOT - ../../commons/opendaylight - - - sanitytest - 0.5.0-SNAPSHOT - bundle - - - org.osgi - org.osgi.core - provided - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.opendaylight.controller.sanitytest - javax.xml.bind.annotation, - org.osgi.service.component, - org.slf4j, - org.eclipse.osgi.framework.console, - org.osgi.framework, - org.eclipse.osgi.baseadaptor, - org.eclipse.osgi.framework.adaptor, - org.osgi.framework.wiring - org.opendaylight.controller.sanitytest.internal.Activator - - ${project.basedir}/META-INF - - - - - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - diff --git a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java deleted file mode 100644 index 9e6d43a06b..0000000000 --- a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/distribution/Sanity.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.distribution; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import java.util.ArrayList; -import java.util.List; - -public class Sanity { - - static void copy(InputStream in, OutputStream out) throws IOException { - while (true) { - int c = in.read(); - if (c == -1) break; - out.write((char)c); - } - } - - public static void main(String[] args) throws IOException, InterruptedException { - String cwd = System.getProperty("user.dir"); - - System.out.println("Current working directory = " + cwd); - - String os = System.getProperty("os.name").toLowerCase(); - List script = new ArrayList(); - - if(os.contains("windows")){ - script.add("cmd.exe"); - script.add("/c"); - script.add("runsanity.bat"); - } else { - script.add("./runsanity.sh"); - } - - ProcessBuilder processBuilder = new ProcessBuilder(); - processBuilder.inheritIO().command(script); - Process p = processBuilder.start(); - - copy(p.getInputStream(), System.out); - - p.waitFor(); - - System.out.println("Test exited with exitValue = " + p.exitValue()); - - System.exit(p.exitValue()); - } -} diff --git a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java b/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java deleted file mode 100644 index 60db1b31e6..0000000000 --- a/opendaylight/distribution/sanitytest/src/main/java/org/opendaylight/controller/sanitytest/internal/Activator.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sanitytest.internal; - -import java.util.Timer; -import java.util.TimerTask; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.wiring.BundleRevision; - -public class Activator implements BundleActivator { - //10 Second initial, 1 second subsequent - private static final int INITIAL_DELAY = 10000; - private static final int SUBSEQUENT_DELAY = 1000; - private static final int MAX_ATTEMPTS = 120; - - - private String stateToString(int state) { - switch (state) { - case Bundle.ACTIVE: - return "ACTIVE"; - case Bundle.INSTALLED: - return "INSTALLED"; - case Bundle.RESOLVED: - return "RESOLVED"; - case Bundle.UNINSTALLED: - return "UNINSTALLED"; - case Bundle.STARTING: - return "STARTING"; - default: - return "Not CONVERTED: state value is " + state; - } - } - - public void start(final BundleContext bundleContext) throws Exception { - Timer monitorTimer = new Timer("monitor timer", true); - monitorTimer.schedule(new TimerTask() { - @Override - public void run() { - int countup = 0; - boolean failed = false; - boolean resolved = false; - while (!resolved) { - resolved = true; - failed = false; - for(Bundle bundle : bundleContext.getBundles()){ - /* - * A bundle should be ACTIVE, unless it a fragment, in which case it should be RESOLVED - */ - int state = bundle.getState(); - if ((bundle.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) { - //fragment - if (state != Bundle.RESOLVED) { - System.out.println("------ Failed to activate/resolve fragment = " + bundle.getSymbolicName() + " state = " + stateToString(bundle.getState())); - failed = true; - if (state == Bundle.STARTING) - resolved = false; - } - } else { - if(state != Bundle.ACTIVE) { - System.out.println("------ Failed to activate/resolve bundle = " + bundle.getSymbolicName() + " state = " + stateToString(bundle.getState())); - failed = true; - if (state == Bundle.STARTING) - resolved = false; - } - } - } - if (!resolved) { - countup++; - if (countup < MAX_ATTEMPTS) { - System.out.println("all bundles haven't finished starting, will repeat"); - try { - Thread.sleep(SUBSEQUENT_DELAY); - } catch (Exception e) { - System.out.println("Thread.sleep interuptted."); - break; - } - } else - resolved = true; - } - } - - if(failed){ - System.out.flush(); - System.out.println("exiting with 1 as failed"); - System.out.close(); - Runtime.getRuntime().exit(1); - } else { - System.out.flush(); - System.out.println("exiting with 0 as succeeded"); - System.out.close(); - Runtime.getRuntime().exit(0); - } - } - }, INITIAL_DELAY); - } - - public void stop(BundleContext bundleContext) throws Exception { - - } -} diff --git a/pom.xml b/pom.xml index d1e5494b44..5ac8087e2e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,6 @@ 3.0 - opendaylight/distribution/opendaylight @@ -65,16 +64,4 @@ HEAD https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main - - - - integrationtests - - false - - - opendaylight/distribution/sanitytest/ - - -