From 9e957efac0eeb6f947d99a12b328f30e57c64bf7 Mon Sep 17 00:00:00 2001 From: Giovanni Meo Date: Fri, 17 May 2013 13:34:50 +0200 Subject: [PATCH] Add PDE OSGi launcher for the controller project - Created a p2site distribution which will place in a p2 repository all the artifacts that are part of the opendaylight/commons/opendaylight/pom.xml parent pom. The p2site will be built by the controller-merge job on jenkins and will be used as update site for the "opendaylight" target platform. - Created a target-platform "opendaylight" to be used by PDE when used in eclipse, this target platform is supposed to fetch the artifact from a remote P2 site that will be hosted on jenkins after this patch will get in. - Create an OSGi PDE launcher "opendaylight-osgi-launcher" to be able to launch the controller without the assembly phase to be required, this one works with the target-platform "opendaylight" - Created a target-platform "opendaylight-local" to be used by PDE with the assumptions that the p2 site reside local and has been built in the p2site distribution. All this enhancements are to address some of the eclipse usability issues as documented in: https://bugs.opendaylight.org/show_bug.cgi?id=21 Change-Id: I559b92ff52011cd69d306b43edd2531901aac85f Signed-off-by: Giovanni Meo --- .../opendaylight/opendaylight-local.target | 6 + .../opendaylight-osgi-launcher-local.launch | 29 ++ .../opendaylight-osgi-launcher.launch | 29 ++ .../opendaylight/opendaylight.target | 85 ++++ .../opendayligh-target-platform-p2site.launch | 22 + opendaylight/distribution/p2site/pom.xml | 449 ++++++++++++++++++ 6 files changed, 620 insertions(+) create mode 100644 opendaylight/distribution/opendaylight/opendaylight-local.target create mode 100644 opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch create mode 100644 opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch create mode 100644 opendaylight/distribution/opendaylight/opendaylight.target create mode 100644 opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch create mode 100644 opendaylight/distribution/p2site/pom.xml diff --git a/opendaylight/distribution/opendaylight/opendaylight-local.target b/opendaylight/distribution/opendaylight/opendaylight-local.target new file mode 100644 index 0000000000..a7780fe610 --- /dev/null +++ b/opendaylight/distribution/opendaylight/opendaylight-local.target @@ -0,0 +1,6 @@ + + + + + + diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch new file mode 100644 index 0000000000..258373558a --- /dev/null +++ b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher-local.launch @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch new file mode 100644 index 0000000000..a802ee3606 --- /dev/null +++ b/opendaylight/distribution/opendaylight/opendaylight-osgi-launcher.launch @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opendaylight/distribution/opendaylight/opendaylight.target b/opendaylight/distribution/opendaylight/opendaylight.target new file mode 100644 index 0000000000..c714f56716 --- /dev/null +++ b/opendaylight/distribution/opendaylight/opendaylight.target @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch b/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch new file mode 100644 index 0000000000..d6e307f76c --- /dev/null +++ b/opendaylight/distribution/p2site/opendayligh-target-platform-p2site.launch @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/opendaylight/distribution/p2site/pom.xml b/opendaylight/distribution/p2site/pom.xml new file mode 100644 index 0000000000..2efb6747f8 --- /dev/null +++ b/opendaylight/distribution/p2site/pom.xml @@ -0,0 +1,449 @@ + + + 4.0.0 + + 3.0 + + + + + + + + + org.opendaylight.controller + commons.opendaylight + 1.4.0-SNAPSHOT + ../../commons/opendaylight + + + + + reficio + ${nexusproxy}/repositories/reficioplugin/ + + + + org.opendaylight.controller + distribution.p2site + 0.1.0-SNAPSHOT + pom + + + + + org.reficio + p2-maven-plugin + 1.0.0 + + + default-cli + + true + + + org.slf4j:jcl-over-slf4j:${slf4j.version} + false + false + + + org.slf4j:slf4j-api:${slf4j.version} + false + false + + + org.slf4j:log4j-over-slf4j:${slf4j.version} + false + false + + + ch.qos.logback:logback-core:${logback.version} + false + false + + + ch.qos.logback:logback-classic:${logback.version} + false + false + + + org.codehaus.jackson:jackson-mapper-asl:${jackson.version} + false + false + + + org.codehaus.jackson:jackson-core-asl:${jackson.version} + false + false + + + org.codehaus.jackson:jackson-jaxrs:${jackson.version} + false + false + + + org.codehaus.jettison:jettison:1.3.3 + false + false + + + commons-io:commons-io:2.3 + false + false + + + commons-fileupload:commons-fileupload:1.2.2 + false + false + + + equinoxSDK381:javax.servlet:3.0.0.v201112011016 + false + false + + + equinoxSDK381:javax.servlet.jsp:2.2.0.v201112011158 + false + false + + + equinoxSDK381:org.eclipse.equinox.ds:1.4.0.v20120522-1841 + false + false + + + equinoxSDK381:org.eclipse.equinox.util:1.0.400.v20120522-2049 + false + false + + + equinoxSDK381:org.eclipse.osgi.services:3.3.100.v20120522-1822 + false + false + + + equinoxSDK381:org.eclipse.osgi:3.8.1.v20120830-144521 + false + false + + + equinoxSDK381:org.apache.felix.gogo.command:0.8.0.v201108120515 + false + false + + + equinoxSDK381:org.apache.felix.gogo.runtime:0.8.0.v201108120515 + false + false + + + equinoxSDK381:org.apache.felix.gogo.shell:0.8.0.v201110170705 + false + false + + + equinoxSDK381:org.eclipse.equinox.cm:1.0.400.v20120522-1841 + false + false + + + equinoxSDK381:org.eclipse.equinox.console:1.0.0.v20120522-1841 + false + false + + + equinoxSDK381:org.eclipse.equinox.launcher:1.3.0.v20120522-1813 + false + false + + + geminiweb:org.eclipse.gemini.web.core:${geminiweb.version} + false + false + + + geminiweb:org.eclipse.gemini.web.extender:${geminiweb.version} + false + false + + + geminiweb:org.eclipse.gemini.web.tomcat:${geminiweb.version} + false + false + + + geminiweb:org.eclipse.virgo.kernel.equinox.extensions:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.common:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.io:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.math:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.osgi:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.osgi.manifest:${virgo.version} + false + false + + + geminiweb:org.eclipse.virgo.util.parser.manifest:${virgo.version} + false + false + + + org.apache.felix:org.apache.felix.dependencymanager:3.1.0 + false + false + + + org.apache.felix:org.apache.felix.dependencymanager.shell:3.0.1 + false + false + + + com.google.code.gson:gson:2.1 + false + false + + + org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:1.0.1.Final + false + false + + + org.apache.commons:commons-lang3:3.1 + false + false + + + virgomirror:org.eclipse.jdt.core.compiler.batch:3.8.0.I20120518-2145 + false + false + + + eclipselink:javax.persistence:2.0.4.v201112161009 + false + false + + + orbit:javax.activation:1.1.0.v201211130549 + false + false + + + orbit:javax.annotation:1.1.0.v201209060031 + false + false + + + orbit:javax.ejb:3.1.1.v201204261316 + false + false + + + orbit:javax.el:2.2.0.v201108011116 + false + false + + + orbit:javax.mail.glassfish:1.4.1.v201108011116 + false + false + + + orbit:javax.xml.rpc:1.1.0.v201005080400 + false + false + + + orbit:org.apache.catalina:7.0.32.v201211201336 + false + false + + + orbit:org.apache.catalina.ha:7.0.32.v201211201952 + false + false + + + orbit:org.apache.catalina.tribes:7.0.32.v201211201952 + false + false + + + orbit:org.apache.coyote:7.0.32.v201211201952 + false + false + + + orbit:org.apache.el:7.0.32.v201211081135 + false + false + + + orbit:org.apache.jasper:7.0.32.v201211201952 + false + false + + + orbit:org.apache.juli.extras:7.0.32.v201211081135 + false + false + + + orbit:org.apache.tomcat.api:7.0.32.v201211081135 + false + false + + + orbit:org.apache.tomcat.util:7.0.32.v201211201952 + false + false + + + orbit:javax.servlet.jsp.jstl:1.2.0.v201105211821 + false + false + + + orbit:javax.servlet.jsp.jstl.impl:1.2.0.v201210211230 + false + false + + + org.springframework:org.springframework.asm:${spring.version} + false + false + + + org.springframework:org.springframework.aop:${spring.version} + false + false + + + org.springframework:org.springframework.context:${spring.version} + false + false + + + org.springframework:org.springframework.context.support:${spring.version} + false + false + + + org.springframework:org.springframework.core:${spring.version} + false + false + + + org.springframework:org.springframework.beans:${spring.version} + false + false + + + org.springframework:org.springframework.expression:${spring.version} + false + false + + + org.springframework:org.springframework.web:${spring.version} + false + false + + + org.aopalliance:com.springsource.org.aopalliance:1.0.0 + false + false + + + org.springframework:org.springframework.web.servlet:${spring.version} + false + false + + + org.springframework.security:spring-security-config:${spring-security.version} + false + false + + + org.springframework.security:spring-security-core:${spring-security.version} + false + false + + + org.springframework.security:spring-security-web:${spring-security.version} + false + false + + + org.springframework.security:spring-security-taglibs:${spring-security.version} + false + false + + + org.springframework:org.springframework.transaction:${spring-security.version} + false + false + + + org.ow2.chameleon.management:chameleon-mbeans:1.0.0 + false + false + + + com.sun.jersey:jersey-core:${jersey.version} + false + false + + + com.sun.jersey:jersey-server:${jersey.version} + false + false + + + com.sun.jersey:jersey-client:${jersey.version} + false + false + + + com.sun.jersey:jersey-json:${jersey.version} + false + false + + + + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.5.v20120716 + + 10 + ${basedir}/target/repository/ + + /site + + + + + + -- 2.36.6