You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/11/17 17:32:24 UTC
[1/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x e687adadd -> a5a7aba0b
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index 13b57ba..9c23923 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -36,53 +36,43 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.mar.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>132</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediator.bridge</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>mqtt-client</artifactId>
- <version>0.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cep300.extension</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>${carbon.ui.stratos.version}</version>
</dependency>
</dependencies>
@@ -91,7 +81,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>maven-buildnumber-plugin</artifactId>
- <version>0.9.4</version>
<configuration>
<format>{0,date,dd MMM yyyy}</format>
<items>
@@ -285,4 +274,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
index 53dbec5..23a315c 100644
--- a/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
+++ b/products/stratos/modules/distribution/src/main/conf/etc/launch.ini
@@ -22,12 +22,12 @@
# @null is a special value used to override and clear the framework's copy of a System Property prior to starting the framework
# "*" can be used together with @null to clear System Properties that match a prefix name.
-osgi.*=@null
-org.osgi.*=@null
-eclipse.*=@null
+osgi.* = @null
+org.osgi.* = @null
+eclipse.* = @null
-osgi.parentClassloader=app
-osgi.contextClassLoaderParent=app
+osgi.parentClassloader = app
+osgi.contextClassLoaderParent = app
# When osgi.clean is set to "true", any cached data used by the OSGi framework
# will be wiped clean. This will clean the caches used to store bundle
@@ -38,7 +38,7 @@ osgi.contextClassLoaderParent=app
# true, if you manually start a bundle, it would not be available when
# you re-start the system. To avid this, copy the bundle jar to the plugins
# folder, before you re-start the system.
-osgi.clean=true
+osgi.clean = true
# Uncomment the following line to turn on Eclipse Equinox debugging.
# You may also edit the osgi-debug.options file and fine tune the debugging
@@ -46,7 +46,7 @@ osgi.clean=true
#osgi.debug=./repository/conf/osgi-debug.options
# Following system property allows us to control the public JDK packages exported through the system bundle.
-org.osgi.framework.system.packages=javax.accessibility,\
+org.osgi.framework.system.packages = javax.accessibility,\
javax.lang.model.type, \
javax.activity,\
javax.crypto,\
@@ -121,6 +121,9 @@ javax.transaction,\
javax.transaction.xa,\
javax.xml.namespace,\
javax.xml.parsers,\
+javax.xml.stream,\
+javax.xml.stream.events,\
+javax.xml.stream.util,\
javax.xml.transform,\
javax.xml.transform.stream,\
javax.xml.transform.dom,\
@@ -256,8 +259,16 @@ org.apache.xml.resolver.readers,\
org.apache.xml.resolver.etc,\
org.apache.xml.resolver.apps,\
javax.xml.ws,\
+javax.xml.ws.handler,\
+javax.xml.ws.handler.soap,\
+javax.xml.ws.http,\
+javax.xml.ws.soap,\
+javax.xml.ws.spi,\
+javax.xml.ws.spi.http,\
+javax.xml.ws.wsaddressing,\
javax.xml.bind,\
javax.xml.bind.annotation,\
+javax.xml.bind.annotation.adapters,\
javax.annotation,\
javax.jws,\
javax.jws.soap,\
@@ -266,4 +277,3 @@ com.sun.xml.internal.messaging.saaj.soap.ver1_1,\
com.sun.xml.internal.messaging.saaj.soap,\
com.sun.tools.internal.ws.spi,\
org.wso2.carbon.bootstrap
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/integration/test-common/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-common/pom.xml b/products/stratos/modules/integration/test-common/pom.xml
index 016949b..4da23fa 100755
--- a/products/stratos/modules/integration/test-common/pom.xml
+++ b/products/stratos/modules/integration/test-common/pom.xml
@@ -32,13 +32,20 @@
<dependencies>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
@@ -94,33 +101,19 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.metadata.client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.mock.iaas.client</artifactId>
- <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/integration/test-integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/test-integration/pom.xml b/products/stratos/modules/integration/test-integration/pom.xml
index 427b60b..642b333 100755
--- a/products/stratos/modules/integration/test-integration/pom.xml
+++ b/products/stratos/modules/integration/test-integration/pom.xml
@@ -37,11 +37,6 @@
<artifactId>commons-exec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.test.utils</artifactId>
</dependency>
@@ -104,28 +99,23 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.mock.iaas.client</artifactId>
- <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,7 +129,6 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.integration.common</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -223,7 +212,8 @@
</plugin>
</plugins>
</build>
+
<properties>
<suiteFile>${basedir}/src/test/resources/test-suite-all.xml</suiteFile>
</properties>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 3091253..704b2a1 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -332,7 +332,7 @@
org.wso2.carbon:org.wso2.carbon.databridge.datapublisher.feature:${carbon.platform.patch.version.4.2.1}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.ntask.feature:${carbon.platform.patch.version.4.2.1}
+ org.wso2.carbon:org.wso2.carbon.ntask.core.feature:${carbon.platform.patch.version.4.2.1}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.platform.patch.version.4.2.2}
@@ -355,7 +355,7 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.jaxws.webapp.mgt.feature:${carbon.kernel.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${store.version}
+ <featureArtifactDef>org.wso2.store:org.wso2.store.feature:${wso2.store.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.captcha.mgt.server.feature:${carbon.kernel.version}
@@ -406,26 +406,28 @@
org.wso2.carbon:org.wso2.carbon.idp.mgt.feature:${carbon.platform.patch.version.4.2.3}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.stratos.common.feature:2.2.2
+ org.wso2.carbon:org.wso2.carbon.stratos.common.feature:${wso2.carbon.stratos.common.feature.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:4.2.2
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.platform.patch.version.4.2.2}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:4.2.2
+ org.wso2.carbon:org.wso2.carbon.identity.relying.party.server.feature:${carbon.platform.patch.version.4.2.2}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:4.2.0
+ org.wso2.carbon:org.wso2.carbon.identity.application.mgt.feature:${carbon.platform.version.4.2.0}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.core.feature:4.2.3
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.identity.core.feature:${carbon.platform.patch.version.4.2.3}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.identity.user.profile.server.feature:${carbon.platform.patch.version.4.2.2}
</featureArtifactDef>
- <featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:0.9.0.ALPHA4.wso2v3
+ <featureArtifactDef>org.jaggeryjs:org.jaggeryjs.feature:${jaggeryjs.version}
</featureArtifactDef>
- <featureArtifactDef>caramel:caramel.feature:1.0.1</featureArtifactDef>
+ <featureArtifactDef>caramel:caramel.feature:${caramel.version}</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1
+ org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${carbon.platform.patch.version.4.2.1}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.logging.mgt.feature:${carbon.platform.patch.version.4.2.2}
@@ -435,19 +437,26 @@
</featureArtifactDef>
<!--CEP-->
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.input.adaptor.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.input.adaptor.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.output.adaptor.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.output.adaptor.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.builder.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.builder.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.formatter.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.formatter.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.tracer.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.tracer.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.statistics.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.statistics.feature:${carbon.event.processor.version}
</featureArtifactDef>
- <featureArtifactDef>org.wso2.carbon:org.wso2.carbon.event.stream.manager.feature:1.0.0
+ <featureArtifactDef>
+ org.wso2.carbon:org.wso2.carbon.event.stream.manager.feature:${carbon.event.processor.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.databridge.datareceiver.feature:${carbon.kernel.version}
@@ -501,7 +510,6 @@
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.manager.styles.feature:${project.version}
</featureArtifactDef>
- <!-- Mock IaaS features -->
<featureArtifactDef>
org.apache.stratos:org.apache.stratos.mock.iaas.api.feature:${project.version}
</featureArtifactDef>
@@ -614,7 +622,7 @@
<features>
<feature>
<id>org.wso2.store.feature.group</id>
- <version>${store.version}</version>
+ <version>${wso2.store.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
@@ -649,22 +657,10 @@
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
- <id>org.wso2.carbon.ntask.feature.group</id>
+ <id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
- <id>org.apache.stratos.common.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
- <id>org.apache.stratos.manager.styles.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <!--feature>
- <id>org.wso2.carbon.transaction.manager.feature.group</id>
- <version>${carbon.platform.patch.version.4.2.1}</version>
- </feature-->
- <feature>
<id>org.wso2.carbon.transport.mgt.server.feature.group</id>
<version>${carbon.kernel.version}</version>
</feature>
@@ -681,22 +677,6 @@
<version>${carbon.kernel.version}</version>
</feature>
<feature>
- <id>org.apache.stratos.manager.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
- <id>org.apache.stratos.rest.endpoint.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
- <id>org.apache.stratos.metadata.service.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
- <id>org.apache.stratos.messaging.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
<version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
@@ -706,59 +686,84 @@
</feature>
<feature>
<id>org.jaggeryjs.feature.group</id>
- <version>0.9.0.ALPHA4.wso2v3</version>
+ <version>${jaggeryjs.version}</version>
</feature>
<feature>
<id>caramel.feature.group</id>
- <version>1.0.1</version>
+ <version>${caramel.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.oauth.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.provider.server.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.idp.mgt.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.stratos.common.feature.group</id>
- <version>2.2.2</version>
+ <version>${wso2.carbon.stratos.common.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.application.mgt.feature.group</id>
- <version>4.2.0</version>
+ <version>${carbon.platform.version.4.2.0}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.core.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.user.profile.server.feature.group</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
- <!-- User Management features -->
<feature>
<id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
+
+ <!-- Stratos features -->
+ <feature>
+ <id>org.apache.stratos.common.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.manager.styles.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.manager.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.rest.endpoint.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.metadata.service.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.messaging.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
<feature>
<id>org.apache.stratos.custom.handlers.feature.group</id>
<version>${project.version}</version>
@@ -783,6 +788,10 @@
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature>
+ <id>org.wso2.carbon.ntask.core.feature.group</id>
+ <version>${carbon.platform.patch.version.4.2.1}</version>
+ </feature>
+ <feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
@@ -795,14 +804,6 @@
<version>${carbon.platform.patch.version.4.2.4}</version>
</feature>
<feature>
- <id>org.apache.stratos.autoscaler.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
- <id>org.apache.stratos.messaging.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.wso2.carbon.registry.core.feature.group</id>
<version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
@@ -814,6 +815,16 @@
<id>org.wso2.carbon.registry.resource.properties.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
+
+ <!-- Stratos features -->
+ <feature>
+ <id>org.apache.stratos.autoscaler.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.messaging.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
<feature>
<id>org.apache.stratos.common.feature.group</id>
<version>${project.version}</version>
@@ -838,10 +849,6 @@
<deleteOldProfileFiles>true</deleteOldProfileFiles>
<features>
<feature>
- <id>org.apache.stratos.common.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
<version>${carbon.deployment.version}</version>
</feature>
@@ -862,10 +869,6 @@
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
- <id>org.apache.stratos.cloud.controller.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.wso2.carbon.service.mgt.server.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
@@ -897,6 +900,16 @@
<id>org.wso2.carbon.event.server.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
+
+ <!-- Stratos features -->
+ <feature>
+ <id>org.apache.stratos.cloud.controller.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
+ <feature>
+ <id>org.apache.stratos.common.feature.group</id>
+ <version>${project.version}</version>
+ </feature>
</features>
</configuration>
</execution>
@@ -933,6 +946,12 @@
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
+ <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
+ </feature>
+
+ <!-- Stratos features -->
+ <feature>
<id>org.apache.stratos.common.feature.group</id>
<version>${project.version}</version>
</feature>
@@ -944,10 +963,6 @@
<id>org.apache.stratos.messaging.feature.group</id>
<version>${project.version}</version>
</feature>
- <feature>
- <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
- <version>4.2.2</version>
- </feature>
</features>
</configuration>
</execution>
@@ -969,7 +984,7 @@
<features>
<feature>
<id>org.wso2.store.feature.group</id>
- <version>${store.version}</version>
+ <version>${wso2.store.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.webapp.mgt.feature.group</id>
@@ -1004,7 +1019,7 @@
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
- <id>org.wso2.carbon.ntask.feature.group</id>
+ <id>org.wso2.carbon.ntask.core.feature.group</id>
<version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
@@ -1041,55 +1056,55 @@
</feature>
<feature>
<id>org.jaggeryjs.feature.group</id>
- <version>0.9.0.ALPHA4.wso2v3</version>
+ <version>${jaggeryjs.version}</version>
</feature>
<feature>
<id>caramel.feature.group</id>
- <version>1.0.1</version>
+ <version>${caramel.version}</version>
</feature>
<feature>
<id>
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
</id>
- <version>4.2.1</version>
+ <version>${carbon.platform.patch.version.4.2.1}</version>
</feature>
<feature>
<id>
org.wso2.carbon.identity.application.authentication.framework.server.feature.group
</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.oauth.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.provider.server.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.idp.mgt.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.stratos.common.feature.group</id>
- <version>2.2.2</version>
+ <version>${wso2.carbon.stratos.common.feature.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.relying.party.server.feature.group</id>
- <version>4.2.2</version>
+ <version>${carbon.platform.patch.version.4.2.2}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.application.mgt.feature.group</id>
- <version>4.2.0</version>
+ <version>${carbon.platform.version.4.2.0}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.core.feature.group</id>
- <version>4.2.3</version>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
</feature>
<feature>
<id>org.wso2.carbon.module.mgt.server.feature.group</id>
@@ -1107,31 +1122,31 @@
<!--CEP features-->
<feature>
<id>org.wso2.carbon.event.input.adaptor.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.output.adaptor.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.builder.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.formatter.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.tracer.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.statistics.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.event.stream.manager.feature.group</id>
- <version>1.0.0</version>
+ <version>${carbon.event.processor.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datareceiver.feature.group</id>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/pom.xml b/products/stratos/pom.xml
index ff1396f..69874e0 100755
--- a/products/stratos/pom.xml
+++ b/products/stratos/pom.xml
@@ -35,32 +35,4 @@
<module>modules/distribution</module>
<module>modules/integration</module>
</modules>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <property>
- <name>sign</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index 49f1181..d8dc84c 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -30,20 +30,10 @@
<artifactId>stratos-service-stubs-parent</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Service Stubs</name>
- <url>http://apache.org</url>
<modules>
<module>org.apache.stratos.cloud.controller.service.stub</module>
<module>org.apache.stratos.manager.service.stub</module>
<module>org.apache.stratos.autoscaler.service.stub</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+</project>
[3/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-joda/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-joda/pom.xml b/dependencies/jclouds/jclouds-joda/pom.xml
index 0a8c840..55f3e25 100644
--- a/dependencies/jclouds/jclouds-joda/pom.xml
+++ b/dependencies/jclouds/jclouds-joda/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-joda</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.date.joda*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-netty/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-netty/pom.xml b/dependencies/jclouds/jclouds-netty/pom.xml
index b1f6169..0598a82 100644
--- a/dependencies/jclouds/jclouds-netty/pom.xml
+++ b/dependencies/jclouds/jclouds-netty/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-netty</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,8 +53,8 @@
<Export-Package>org.jclouds.netty*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- org.jboss.netty*;version="${netty.imp.pkg.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ org.jboss.netty*;version="${netty.imp.pkg.version.range}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -64,4 +63,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-sshj/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-sshj/pom.xml b/dependencies/jclouds/jclouds-sshj/pom.xml
index 90b9492..8f147b3 100644
--- a/dependencies/jclouds/jclouds-sshj/pom.xml
+++ b/dependencies/jclouds/jclouds-sshj/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.sshj*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-common/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-common/pom.xml b/dependencies/jclouds/openstack-common/pom.xml
index 2168973..25041f4 100644
--- a/dependencies/jclouds/openstack-common/pom.xml
+++ b/dependencies/jclouds/openstack-common/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.common</groupId>
<artifactId>openstack-common</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.openstack*;version="${jclouds.version}";-noimport:=true</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-keystone/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-keystone/pom.xml b/dependencies/jclouds/openstack-keystone/pom.xml
index 2624bea..7a532c8 100644
--- a/dependencies/jclouds/openstack-keystone/pom.xml
+++ b/dependencies/jclouds/openstack-keystone/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -83,7 +82,7 @@
<Export-Package>org.jclouds.openstack*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -92,4 +91,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-neutron/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-neutron/pom.xml b/dependencies/jclouds/openstack-neutron/pom.xml
index e3fffa4..e45b860 100644
--- a/dependencies/jclouds/openstack-neutron/pom.xml
+++ b/dependencies/jclouds/openstack-neutron/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.openstack.neutron.v2*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/openstack-nova/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/openstack-nova/pom.xml b/dependencies/jclouds/openstack-nova/pom.xml
index ba3a73a..328fc4e 100644
--- a/dependencies/jclouds/openstack-nova/pom.xml
+++ b/dependencies/jclouds/openstack-nova/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-nova</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.openstack.nova.v2_0*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/sts/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/sts/pom.xml b/dependencies/jclouds/sts/pom.xml
index 8167cfc..1785224 100644
--- a/dependencies/jclouds/sts/pom.xml
+++ b/dependencies/jclouds/sts/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>sts</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -84,7 +83,7 @@
</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -93,4 +92,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/org.wso2.carbon.ui/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/org.wso2.carbon.ui/pom.xml b/dependencies/org.wso2.carbon.ui/pom.xml
index cbee800..0248507 100644
--- a/dependencies/org.wso2.carbon.ui/pom.xml
+++ b/dependencies/org.wso2.carbon.ui/pom.xml
@@ -346,4 +346,4 @@
</profile>
<!-- END SNIPPET: release-profile -->
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/rocoto/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/rocoto/pom.xml b/dependencies/rocoto/pom.xml
index 420a984..4f8072d 100644
--- a/dependencies/rocoto/pom.xml
+++ b/dependencies/rocoto/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.99soft.guice</groupId>
<artifactId>rocoto</artifactId>
- <version>${rocoto.version}</version>
</dependency>
</dependencies>
@@ -57,7 +56,7 @@
!com.google.inject*,
*;resolution:=optional
</Import-Package>
- <Fragment-Host>guice;bundle-version="${guice.imp.pkg.version}"</Fragment-Host>
+ <Fragment-Host>guice;bundle-version="${guice.imp.pkg.version.range}"</Fragment-Host>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<unpackBundle>true</unpackBundle>
@@ -65,4 +64,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/sshj/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/sshj/pom.xml b/dependencies/sshj/pom.xml
index 2d01282..74740d6 100644
--- a/dependencies/sshj/pom.xml
+++ b/dependencies/sshj/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>${net.schmizz.sshj.version}</version>
</dependency>
</dependencies>
@@ -54,9 +53,9 @@
<Import-Package>
!net.schmizz.*,
javax.crypto*,
- com.jcraft.jzlib*;version="${jzlib.imp.pkg.version}",
- org.slf4j*;version="${slf4j.imp.pkg.version}",
- org.bouncycastle*;version="${bouncycastle.imp.pkg.version}",
+ com.jcraft.jzlib*;version="${jzlib.imp.pkg.version.range}",
+ org.slf4j*;version="${slf4j.imp.pkg.version.range}",
+ org.bouncycastle*;version="${bouncycastle.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -65,4 +64,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
index 32eceb8..a455bcf 100644
--- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
+++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.0.0/pom.xml
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wso2.siddhi</groupId>
<artifactId>siddhi-core</artifactId>
<version>2.0.0-wso2v5</version>
@@ -48,7 +52,14 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -60,4 +71,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
index 570d655..3d47615 100644
--- a/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
+++ b/extensions/cep/modules/stratos-cep-extension/wso2cep-3.1.0/pom.xml
@@ -35,6 +35,10 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.wso2.siddhi</groupId>
<artifactId>siddhi-core</artifactId>
<version>2.1.0-wso2v1</version>
@@ -42,7 +46,14 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
@@ -54,4 +65,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
index f110e22..105d4b1 100644
--- a/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
+++ b/extensions/das/modules/artifacts/metering-dashboard/capps/pom.xml
@@ -22,13 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>das-extension</artifactId>
<version>4.1.5-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>metering-service-capps</artifactId>
<name>Apache Stratos - Metering Service CApps</name>
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -52,7 +51,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -71,6 +69,4 @@
</plugin>
</plugins>
</build>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml b/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
index 840a932..cdcde5a 100644
--- a/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
+++ b/extensions/das/modules/artifacts/monitoring-dashboard/capps/pom.xml
@@ -22,13 +22,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>das-extension</artifactId>
<version>4.1.5-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>monitoring-service-capps</artifactId>
<name>Apache Stratos - Monitoring Service CApps</name>
@@ -39,7 +39,6 @@
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
<executions>
<execution>
<id>auto-clean</id>
@@ -52,7 +51,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<phase>process-resources</phase>
@@ -71,6 +69,4 @@
</plugin>
</plugins>
</build>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/das/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/das/pom.xml b/extensions/das/pom.xml
index 13f9a22..e81a68b 100644
--- a/extensions/das/pom.xml
+++ b/extensions/das/pom.xml
@@ -31,12 +31,11 @@
<packaging>pom</packaging>
<name>Apache Stratos - DAS Extension</name>
<description>Apache Stratos DAS extension</description>
+
<modules>
<module>modules/artifacts/metering-dashboard/capps</module>
<module>modules/artifacts/monitoring-dashboard/capps</module>
<module>modules/stratos-das-extension</module>
<module>modules/distribution</module>
</modules>
-
-
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/aws-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/aws-extension/pom.xml b/extensions/load-balancer/modules/aws-extension/pom.xml
index 812dde3..02b5eff 100644
--- a/extensions/load-balancer/modules/aws-extension/pom.xml
+++ b/extensions/load-balancer/modules/aws-extension/pom.xml
@@ -20,9 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
<modelVersion>4.0.0</modelVersion>
-
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-load-balancer-extensions</artifactId>
@@ -38,47 +36,38 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk</artifactId>
- <version>1.8.8</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5.wso2v1</version>
</dependency>
</dependencies>
@@ -87,7 +76,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<configuration>
<archive>
<manifest>
@@ -120,5 +108,4 @@
</plugin>
</plugins>
</build>
-
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/haproxy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/haproxy-extension/pom.xml b/extensions/load-balancer/modules/haproxy-extension/pom.xml
index 15e4d27..5f42132 100644
--- a/extensions/load-balancer/modules/haproxy-extension/pom.xml
+++ b/extensions/load-balancer/modules/haproxy-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/lvs-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/lvs-extension/pom.xml b/extensions/load-balancer/modules/lvs-extension/pom.xml
index e06617c..e100c70 100644
--- a/extensions/load-balancer/modules/lvs-extension/pom.xml
+++ b/extensions/load-balancer/modules/lvs-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/extensions/load-balancer/modules/nginx-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/load-balancer/modules/nginx-extension/pom.xml b/extensions/load-balancer/modules/nginx-extension/pom.xml
index b29e6ed..71989d1 100644
--- a/extensions/load-balancer/modules/nginx-extension/pom.xml
+++ b/extensions/load-balancer/modules/nginx-extension/pom.xml
@@ -36,37 +36,30 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
</dependencies>
@@ -107,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
index 364b2a4..6534a26 100644
--- a/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
+++ b/features/autoscaler/org.apache.stratos.autoscaler.feature/pom.xml
@@ -54,7 +54,16 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.autoscaler:${project.version}
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.oauth.stub:${carbon.platform.patch.version.4.2.3}
+ </bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.application.mgt.stub:${carbon.platform.version.4.2.0}
+ </bundleDef>
+
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler:${project.version}
</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}
@@ -62,9 +71,28 @@
<bundleDef>
org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
</bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
+ <bundleDef>org.mvel:mvel2:${mvel2.version}</bundleDef>
+ <bundleDef>org.apache.amber.wso2:amber:${amber.version}</bundleDef>
+ <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:${nimbus.jose.jwt.wso2.version}</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.core:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.ntask.core:${carbon.platform.patch.version.4.2.1}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -72,4 +100,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cep/org.apache.stratos.event.processor.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
index ac6ded6..1ccca10 100644
--- a/features/cep/org.apache.stratos.event.processor.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.feature/pom.xml
@@ -37,13 +37,11 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.event.processor.server.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.event.processor.ui.feature</artifactId>
- <version>1.0.0</version>
<type>zip</type>
</dependency>
</dependencies>
@@ -71,7 +69,7 @@
org.apache.stratos:org.apache.stratos.event.processor.server.feature:${project.version}
</includedFeatureDef>
<includedFeatureDef>
- org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:1.0.0
+ org.wso2.carbon:org.wso2.carbon.event.processor.ui.feature:${carbon.event.processor.version}
</includedFeatureDef>
</includedFeatures>
</configuration>
@@ -80,4 +78,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
index 8241985..06a5d61 100644
--- a/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
+++ b/features/cep/org.apache.stratos.event.processor.server.feature/pom.xml
@@ -82,7 +82,8 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.event.processor.core:${siddhi.event.processor.version}
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.event.processor.core:${siddhi.event.processor.version}
</bundleDef>
<bundleDef>
org.wso2.carbon:org.wso2.carbon.event.processor.admin:${siddhi.event.processor.version}
@@ -104,7 +105,8 @@
</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -112,4 +114,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
index 7ac3bff..3befc3d 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/pom.xml
@@ -81,13 +81,20 @@
</adviceFile>
<bundles>
<!-- Stratos bundles -->
- <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.cloud.controller:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.kubernetes.client:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.kubernetes.client:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.mock.iaas.client:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.mock.iaas.client:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
</bundleDef>
<!-- Kubernetes API wrapper -->
@@ -99,6 +106,7 @@
<!-- jclouds bundles -->
<bundleDef>org.apache.jclouds:jclouds-scriptbuilder:${jclouds.version}</bundleDef>
<bundleDef>org.apache.jclouds.driver:jclouds-slf4j:${jclouds.version}</bundleDef>
+
<!-- jclouds wrappers in Stratos -->
<bundleDef>org.apache.stratos:google-compute-engine:${jclouds.version}
</bundleDef>
@@ -122,54 +130,68 @@
<bundleDef>org.apache.stratos:jclouds-sshj:${jclouds.version}</bundleDef>
<!-- jclouds dependencies -->
- <bundleDef>com.jcraft:jsch.agentproxy.core:0.0.8</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.connector-factory:0.0.8</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.sshagent:0.0.8</bundleDef>
+ <bundleDef>com.jcraft:jsch.agentproxy.core:${jsch.agentproxy.version}</bundleDef>
+ <bundleDef>
+ com.jcraft:jsch.agentproxy.connector-factory:${jsch.agentproxy.version}
+ </bundleDef>
+ <bundleDef>com.jcraft:jsch.agentproxy.sshagent:${jsch.agentproxy.version}</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-sshj:0.0.8_1
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.jsch-agentproxy-sshj:${jsch.agentproxy.sshj.version}
</bundleDef>
- <bundleDef>com.jcraft:jsch.agentproxy.usocket-nc:0.0.8</bundleDef>
- <bundleDef>io.netty:netty:3.5.9.Final</bundleDef>
- <bundleDef>com.google.guava:guava:16.0.1</bundleDef>
- <bundleDef>net.java.dev.jna:jna:4.1.0</bundleDef>
- <bundleDef>net.java.dev.jna:jna-platform:4.1.0</bundleDef>
- <bundleDef>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jzlib:1.1.1_1
+ <bundleDef>com.jcraft:jsch.agentproxy.usocket-nc:${usocket.nc.version}</bundleDef>
+ <bundleDef>io.netty:netty:${netty.version}</bundleDef>
+ <bundleDef>com.google.guava:guava:${guava.version}</bundleDef>
+ <bundleDef>net.java.dev.jna:jna:${jna.version}</bundleDef>
+ <bundleDef>net.java.dev.jna:jna-platform:${jna.version}</bundleDef>
+ <bundleDef>
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.jzlib:${servicemix.bundles.jzlib.version}
</bundleDef>
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:1.45.wso2v1</bundleDef>
- <bundleDef>javax.ws.rs:jsr311-api:1.1.1</bundleDef>
+ <bundleDef>org.bouncycastle.wso2:bcprov-jdk16:${bcprov.jdk16.version}</bundleDef>
+ <bundleDef>javax.ws.rs:jsr311-api:${jsr311.api.version}</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject:1_2
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-inject:${servicemix.bundles.javax.inject.version}
</bundleDef>
<bundleDef>
- org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance:1.0_6
+ org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance:${servicemix.bundles.aopalliance.version}
</bundleDef>
<!-- jclouds dependency wrappers in Stratos -->
- <bundleDef>org.apache.stratos:guice:3.0</bundleDef>
- <bundleDef>org.apache.stratos:net.schmizz.sshj:0.8.1</bundleDef>
- <bundleDef>org.apache.stratos:guice-assistedinject:3.0</bundleDef>
- <bundleDef>org.apache.stratos:guice-multibindings:3.0</bundleDef>
- <bundleDef>org.apache.stratos:rocoto:6.1</bundleDef>
+ <bundleDef>org.apache.stratos:guice:${guice.version}</bundleDef>
+ <bundleDef>org.apache.stratos:net.schmizz.sshj:${net.schmizz.sshj.version}</bundleDef>
+ <bundleDef>
+ org.apache.stratos:guice-assistedinject:${guice.assistedinject.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:guice-multibindings:${guice.multibindings.version}
+ </bundleDef>
+ <bundleDef>org.apache.stratos:rocoto:${rocoto.version}</bundleDef>
<!-- Misc -->
<bundleDef>com.sun.jersey:jersey-core:${sun.jersey.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-compress:1.5</bundleDef>
- <bundleDef>com.jamesmurty.utils.wso2:java-xmlbuilder:0.4.wso2v1</bundleDef>
- <bundleDef>commons-io.wso2:commons-io:2.0.0.wso2v1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.7.0</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.7.0</bundleDef>
+ <bundleDef>org.apache.commons:commons-compress:${commons.compress.version}</bundleDef>
+ <bundleDef>
+ com.jamesmurty.utils.wso2:java-xmlbuilder:${java.xmlbuilder.wso2.version}
+ </bundleDef>
+ <bundleDef>commons-io.wso2:commons-io:${commons.io.wso2.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:${slf4j.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:${slf4j.log4j12.version}</bundleDef>
<bundleDef>com.google.common.wso2:google-collect:${google.collect.osgi.version}
</bundleDef>
- <bundleDef>jdom.wso2:jdom:1.0.0.wso2v1</bundleDef>
- <bundleDef>org.json.wso2:json:1.0.0.wso2v1</bundleDef>
- <bundleDef>org.apache.httpcomponents.wso2:httpcore:4.3.0.wso2v1</bundleDef>
- <bundleDef>org.apache.httpcomponents.wso2:httpclient:4.2.5.wso2v1</bundleDef>
+ <bundleDef>jdom.wso2:jdom:${jdom.wso2.version}</bundleDef>
+ <bundleDef>org.json.wso2:json:${json.wso2.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpclient-osgi:${httpclient.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpcore-osgi:${httpcore.version}</bundleDef>
</bundles>
<importBundles>
</importBundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.wso2.carbon.ntask.core:${carbon.platform.patch.version.4.2.1}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -177,4 +199,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.feature/pom.xml b/features/common/org.apache.stratos.common.feature/pom.xml
index d0604fe..5d75e68 100644
--- a/features/common/org.apache.stratos.common.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.feature/pom.xml
@@ -35,13 +35,11 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common.server.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.custom.handlers.feature</artifactId>
- <version>${project.version}</version>
<type>zip</type>
</dependency>
</dependencies>
@@ -75,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.common.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.common.server.feature/pom.xml b/features/common/org.apache.stratos.common.server.feature/pom.xml
index 6a00de8..ec4cd0c 100644
--- a/features/common/org.apache.stratos.common.server.feature/pom.xml
+++ b/features/common/org.apache.stratos.common.server.feature/pom.xml
@@ -86,11 +86,19 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
+
+ <!-- Misc -->
<bundleDef>org.quartz-scheduler.wso2:quartz:${quartz.wso2.version}</bundleDef>
<bundleDef>org.json.wso2:json:${json.wso2.version}</bundleDef>
<bundleDef>kaptcha.wso2:kaptcha:${kaptcha.wso2.version}</bundleDef>
- <bundleDef>org.wso2.carbon:org.wso2.carbon.captcha.mgt:${carbon.kernel.version}</bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.captcha.mgt:${carbon.kernel.version}
+ </bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>
@@ -103,4 +111,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
index df42777..ef9dbd2 100644
--- a/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
+++ b/features/common/org.apache.stratos.custom.handlers.feature/pom.xml
@@ -55,8 +55,17 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.custom.handlers:${project.version}</bundleDef>
- <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:2.26.1.wso2v2</bundleDef>
+ <bundleDef>
+ org.wso2.carbon:org.wso2.carbon.identity.oauth:${carbon.platform.patch.version.4.2.3}
+ </bundleDef>
+
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.custom.handlers:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>com.nimbusds.wso2:nimbus-jose-jwt:${nimbus.jose.jwt.wso2.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -64,4 +73,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
index 7e09b64..c428358 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.common.feature/pom.xml
@@ -54,15 +54,15 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.common:${project.version}</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.load.balancer.common:${project.version}
</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef>
+ <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}
+ </importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -70,4 +70,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
index 03816dd..eed0860 100644
--- a/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.load.balancer.feature/pom.xml
@@ -55,13 +55,32 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.load.balancer:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.load.balancer:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler.service.stub:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ org.wso2.orbit.commons-collections:commons-collections:${commons.collections.version}
+ </bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
+ <importFeatureDef>
+ org.wso2.carbon.core.server:${carbon.kernel.version}
+ </importFeatureDef>
+ <importFeatureDef>
+ org.apache.synapse.wso2:${synapse.wso2.feature.version}
</importFeatureDef>
- <importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.feature.version}</importFeatureDef>
</importFeatures>
</configuration>
</execution>
@@ -69,4 +88,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
index e743ed8..196a2be 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.client.feature/pom.xml
@@ -20,6 +20,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-manager-features</artifactId>
@@ -27,7 +28,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.metadata.client.feature</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Metadata client Feature</name>
@@ -56,12 +56,19 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.metadata.client:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.metadata.client:${project.version}
</bundleDef>
+
+ <!-- Misc -->
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.apache.httpcomponents:httpclient-osgi:4.3.5</bundleDef>
- <bundleDef>org.apache.httpcomponents:httpcore-osgi:4.3.2</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>
+ commons-configuration:commons-configuration:${commons.configuration.version}
+ </bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpclient-osgi:${httpclient.version}</bundleDef>
+ <bundleDef>org.apache.httpcomponents:httpcore-osgi:${httpcore.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -69,4 +76,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
index 09048a3..b8889d2 100644
--- a/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
+++ b/features/manager/metadata-service/org.apache.stratos.metadata.service.feature/pom.xml
@@ -33,200 +33,6 @@
<name>Apache Stratos - Meta Data Service feature</name>
<description>This feature packs the Meta Data Service of stratos</description>
- <dependencies>
- <!--CXF runtime environment-->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-boolean</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0-beta3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0-m10</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.11</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.xmlschema</groupId>
- <artifactId>xmlschema-core</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon.webapp.ext</groupId>
- <artifactId>carbon-cxf</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>4.2.0</version>
- </dependency>
- <!--dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
- </dependency-->
- </dependencies>
-
<build>
<resources>
<resource>
@@ -297,7 +103,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
index b14a6b6..6ab73bb 100644
--- a/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
+++ b/features/manager/rest-endpoint/org.apache.stratos.rest.endpoint.feature/pom.xml
@@ -33,200 +33,6 @@
<name>Apache Stratos - RESTful admin services feature</name>
<description>This feature packs the RESTful API cabability of stratos</description>
- <dependencies>
- <!--CXF runtime environment-->
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-dv</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjc-utils</groupId>
- <artifactId>cxf-xjc-runtime</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-ts</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-boolean</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf.xjcplugins</groupId>
- <artifactId>cxf-xjc-bug671</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.ehcache</groupId>
- <artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpasyncclient</artifactId>
- <version>4.0-beta3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-nio</artifactId>
- <version>4.2.4</version>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0-m10</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <version>3.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.security</groupId>
- <artifactId>wss4j</artifactId>
- <version>1.6.11</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.xmlschema</groupId>
- <artifactId>xmlschema-core</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.santuario</groupId>
- <artifactId>xmlsec</artifactId>
- <version>1.5.5</version>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-asm</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon.webapp.ext</groupId>
- <artifactId>carbon-cxf</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.client</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>4.2.0</version>
- </dependency>
- </dependencies>
-
<build>
<resources>
<resource>
@@ -299,4 +105,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
index 031e7eb..66ee3eb 100644
--- a/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
+++ b/features/manager/stratos-mgt/org.apache.stratos.manager.server.feature/pom.xml
@@ -79,19 +79,33 @@
</properties>
</adviceFile>
<bundles>
+ <!-- Stratos bundles -->
<bundleDef>org.apache.stratos:org.apache.stratos.manager:${project.version}</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.manager.service.stub:${project.version}
</bundleDef>
- <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v8</bundleDef>
<bundleDef>
org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}
</bundleDef>
- <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
- <bundleDef>com.google.code.gson:gson:2.1</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
- <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.autoscaler.service.stub:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>org.wso2.andes.wso2:andes-client:${andes.client.version}</bundleDef>
+ <bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>
+ org.eclipse.jgit:org.eclipse.jgit:${eclipse.jgit.wso2.osgi.version}
+ </bundleDef>
+ <bundleDef>com.jcraft:jsch:${jsch.version}</bundleDef>
+ <bundleDef>com.gitblit:gitblit:${gitblit.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -99,4 +113,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
index 262e485..68fc7ff 100644
--- a/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
+++ b/features/manager/styles/org.apache.stratos.manager.styles.feature/pom.xml
@@ -54,7 +54,8 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.manager.styles:${project.version}
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.manager.styles:${project.version}
</bundleDef>
</bundles>
<importFeatures>
@@ -66,4 +67,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/messaging/org.apache.stratos.messaging.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/messaging/org.apache.stratos.messaging.feature/pom.xml b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
index 3a30229..4b0e09b 100644
--- a/features/messaging/org.apache.stratos.messaging.feature/pom.xml
+++ b/features/messaging/org.apache.stratos.messaging.feature/pom.xml
@@ -54,12 +54,22 @@
</properties>
</adviceFile>
<bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ <!-- Stratos bundles -->
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+
+ <!-- Misc -->
+ <bundleDef>
+ org.wso2.orbit.commons-collections:commons-collections:${commons.collections.version}
</bundleDef>
<bundleDef>com.google.code.gson:gson:${gson.version}</bundleDef>
- <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
- <bundleDef>org.slf4j:slf4j-api:1.6.4</bundleDef>
- <bundleDef>org.slf4j:slf4j-log4j12:1.6.4</bundleDef>
+ <bundleDef>org.apache.commons:commons-lang3:${commons.lang3.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-api:${slf4j.version}</bundleDef>
+ <bundleDef>org.slf4j:slf4j-log4j12:${slf4j.log4j12.version}</bundleDef>
</bundles>
</configuration>
</execution>
@@ -67,4 +77,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
[2/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
index bea6e3c..1ee50ac 100644
--- a/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
+++ b/features/mock-iaas/org.apache.stratos.mock.iaas.api.feature/pom.xml
@@ -37,177 +37,146 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle</artifactId>
- <version>2.7.6</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjc-utils</groupId>
<artifactId>cxf-xjc-runtime</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
- <version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
- <version>2.6.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-bug671</artifactId>
- <version>2.6.2</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
<artifactId>ehcache-core</artifactId>
- <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
- <version>4.0-beta3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.2.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
- <version>4.2.4</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.0-m10</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.13</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
- <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.3.4</version>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
+ <groupId>org.apache.neethi.wso2</groupId>
<artifactId>neethi</artifactId>
- <version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.6.11</version>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
- <version>2.0.3</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
- <version>1.5.5</version>
</dependency>
<dependency>
- <groupId>wsdl4j</groupId>
+ <groupId>wsdl4j.wso2</groupId>
<artifactId>wsdl4j</artifactId>
- <version>1.6.3</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>org.wso2.orbit.commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
- <version>1.0</version>
</dependency>
+
+ <!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.7.RELEASE</version>
</dependency>
</dependencies>
@@ -284,6 +253,12 @@
<bundleDef>
org.apache.stratos:org.apache.stratos.mock.iaas:${project.version}
</bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.common:${project.version}
+ </bundleDef>
+ <bundleDef>
+ org.apache.stratos:org.apache.stratos.messaging:${project.version}
+ </bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core:${carbon.kernel.version}</importFeatureDef>
@@ -294,4 +269,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 893132c..2f2d578 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,17 +20,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-parent</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>stratos-features-parent</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Features</name>
- <url>http://apache.org</url>
<modules>
<module>load-balancer</module>
@@ -42,13 +41,4 @@
<module>common</module>
<module>cep</module>
</modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03512e0..51775bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -249,6 +249,7 @@
<dependencyManagement>
<dependencies>
+ <!-- Carbon dependencies -->
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>SecVerifier</artifactId>
@@ -256,6 +257,133 @@
<version>${carbon.kernel.version}</version>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.base</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.mgt</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.securevault</groupId>
+ <artifactId>org.wso2.securevault</artifactId>
+ <version>${wso2.securevault.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.analytics.hive.stub</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.oauth</artifactId>
+ <version>${carbon.platform.patch.version.4.2.3}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.mediation.initializer</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.core</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.core.common</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.core.services</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ui</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
+ <version>${wso2.carbon.tenant.mgt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
+ <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.stratos.common</artifactId>
+ <version>${wso2.carbon.stratos.common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.mediator.bridge</artifactId>
+ <version>${carbon.platform.version.4.2.0}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
@@ -316,17 +444,530 @@
<version>${commons.exec.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons.lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-decisiontables</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-jsr94</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>knowledge-internal-api</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>knowledge-api</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-verifier</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-templates</artifactId>
+ <version>${drools.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>${xstream.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>stringtemplate</artifactId>
+ <version>${antlr.stringtemplate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
+ <version>${mvel2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+ <version>${eclipse.ecj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ <version>${xmlpull.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <version>${xpp3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>${itext.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jsr94</groupId>
+ <artifactId>jsr94</artifactId>
+ <version>${jsr94.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.lingala.zip4j</groupId>
+ <artifactId>zip4j</artifactId>
+ <version>${zip4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.andes.wso2</groupId>
+ <artifactId>andes-client</artifactId>
+ <version>${andes.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.log4j12.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>${geronimo.jms.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit.wso2</groupId>
+ <artifactId>org.eclipse.jgit</artifactId>
+ <version>${eclipse.jgit.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>${jsch.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons.cli.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>${jline.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>${commons.validator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>opensaml.wso2</groupId>
+ <artifactId>opensaml2</artifactId>
+ <version>${opensaml2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.nimbusds.wso2</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>${nimbus.jose.jwt.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>${libthrift.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.compendium.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+ <version>${eclipse.equinox.http.servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.helper</artifactId>
+ <version>${eclipse.equinox.http.helper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+ <version>${equinox.jsp.jasper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ <version>${javax.servlet.jsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.orbit.commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jamesmurty.utils.wso2</groupId>
+ <artifactId>java-xmlbuilder</artifactId>
+ <version>${java.xmlbuilder.wso2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.paho</groupId>
+ <artifactId>mqtt-client</artifactId>
+ <version>${paho.mqtt.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-all</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jaas</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-mqtt</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-api</artifactId>
+ <version>${kubernetes.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>cxf-utils</artifactId>
+ <version>${kubernetes.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.das.extension</artifactId>
- <version>${project.version}</version>
+ <artifactId>kubernetes-api</artifactId>
+ <version>${kubernetes.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-codegen</artifactId>
+ <version>${kubernetes.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-model</artifactId>
+ <version>${kubernetes.model.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>fabric8-utils</artifactId>
+ <version>${kubernetes.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.oauth.core</groupId>
+ <artifactId>oauth</artifactId>
+ <version>${oauth.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dnsjava</groupId>
+ <artifactId>dnsjava</artifactId>
+ <version>${dnsjava.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-client</artifactId>
+ <version>${websocket.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.util.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-assistedinject</artifactId>
+ <version>${guice.assistedinject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-multibindings</artifactId>
+ <version>${guice.multibindings.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.99soft.guice</groupId>
+ <artifactId>rocoto</artifactId>
+ <version>${rocoto.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.schmizz</groupId>
+ <artifactId>sshj</artifactId>
+ <version>${net.schmizz.sshj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk</artifactId>
+ <version>${aws.java.sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>${velocity.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>${bcprov.jdk15.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <type>mar</type>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>${geronimo.j2ee.management_1.1_spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.hawtbuf</groupId>
+ <artifactId>hawtbuf</artifactId>
+ <version>${hawtbuf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo.jta_1.1_spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.amber.wso2</groupId>
+ <artifactId>amber</artifactId>
+ <version>${amber.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.santuario</groupId>
+ <artifactId>xmlsec</artifactId>
+ <version>${xmlsec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ <version>${xmlschema.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-nio</artifactId>
+ <version>${httpcore.nio.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${javax.ws.rs.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxb.impl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <version>${woodstox.core.asl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>${stax2.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>${wss4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>${xml.resolver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>${ehcache.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpasyncclient</artifactId>
+ <version>${httpasyncclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.api.version}</version>
</dependency>
+ <!-- Jackson -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+
<!-- Automation framework dependencies -->
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
<artifactId>org.wso2.carbon.automation.test.utils</artifactId>
<version>${carbon.automation.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automation</groupId>
@@ -342,19 +983,16 @@
<groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.utils</artifactId>
<version>${carbon.automationutils.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
<version>${carbon.automationutils.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.automationutils</groupId>
<artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
<version>${carbon.automationutils.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -366,6 +1004,340 @@
<artifactId>org.jacoco.agent</artifactId>
<version>${jacoco.agent.version}</version>
</dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.manager.service.stub</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.das.extension</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.kubernetes.client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.mock.iaas.client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.load.balancer.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.wso2.carbon.ui</artifactId>
+ <version>${carbon.ui.stratos.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.integration.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cli</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.mock.iaas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.load.balancer.extension.api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cartridge.agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.python.cartridge.agent.integration.common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cep300.extension</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.metadata.client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Stratos features -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common.server.feature</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.custom.handlers.feature</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.event.processor.server.feature</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.event.processor.ui.feature</artifactId>
+ <version>${carbon.event.processor.version}</version>
+ <type>zip</type>
+ </dependency>
+
+ <!-- jclouds dependencies -->
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>cloudstack</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-enterprise</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>ec2</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>aws-ec2</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>openstack-nova</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>openstack-neutron</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>openstack-keystone</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-scriptbuilder</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>google-compute-engine</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-log4j</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-sshj</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>google-cloud-storage</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>google-compute-engine</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>googlecloud</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-blobstore</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-bouncycastle</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-joda</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-netty</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>oauth</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.common</groupId>
+ <artifactId>openstack-common</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>sts</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+
+ <!-- Spring -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-asm</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <!-- CXF -->
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-dv</artifactId>
+ <version>${cxf.xjc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-ts</artifactId>
+ <version>${cxf.xjc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-boolean</artifactId>
+ <version>${cxf.xjc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug671</artifactId>
+ <version>${cxf.xjc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
+ <version>${cxf.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.rs.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.rs.client.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.rt.frontend.jaxrs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.core.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -374,14 +1346,14 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>2.1</version>
+ <version>${maven.wagon.ssh.extension.version}</version>
</extension>
</extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>${maven.enforcer.plugin.version}</version>
<executions>
<execution>
<id>enforce</id>
@@ -405,7 +1377,7 @@
<plugin>
<groupId>org.jvnet.maven.incrementalbuild</groupId>
<artifactId>incremental-build-plugin</artifactId>
- <version>1.3</version>
+ <version>${maven.incremental.build.plugin.version}</version>
<executions>
<execution>
<goals>
@@ -600,6 +1572,14 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven.deploy.plugin.version}</version>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${maven.clean.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -613,6 +1593,7 @@
<carbon.analytics.common.version>5.0.0</carbon.analytics.common.version>
<carbon.ui.stratos.version>4.2.0-stratosv2</carbon.ui.stratos.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
+ <carbon.platform.version.4.2.0>4.2.0</carbon.platform.version.4.2.0>
<carbon.platform.patch.version.4.2.1>4.2.1</carbon.platform.patch.version.4.2.1>
<carbon.platform.patch.version.4.2.2>4.2.2</carbon.platform.patch.version.4.2.2>
<carbon.platform.patch.version.4.2.3>4.2.3</carbon.platform.patch.version.4.2.3>
@@ -621,6 +1602,40 @@
<carbon.platform.patch.version.4.2.6>4.2.6</carbon.platform.patch.version.4.2.6>
<carbon.platform.patch.version.4.2.7>4.2.7</carbon.platform.patch.version.4.2.7>
<carbon.platform.patch.version.4.2.8>4.2.8</carbon.platform.patch.version.4.2.8>
+ <wso2.securevault.version>1.0.0-wso2v2</wso2.securevault.version>
+ <wso2.carbon.tenant.mgt.version>2.2.2</wso2.carbon.tenant.mgt.version>
+ <wso2.carbon.stratos.common.version>2.2.0</wso2.carbon.stratos.common.version>
+ <wso2.carbon.stratos.common.feature.version>2.2.2</wso2.carbon.stratos.common.feature.version>
+ <carbon.event.processor.version>1.0.0</carbon.event.processor.version>
+
+ <!-- OSGi import ranges -->
+ <osgi.service.component.imp.pkg.version.range>[1.2.0, 2.0.0)</osgi.service.component.imp.pkg.version.range>
+ <osgi.framework.imp.pkg.version.range>[1.7.0, 2.0.0)</osgi.framework.imp.pkg.version.range>
+ <axiom.imp.pkg.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.imp.pkg.version.range>
+ <axis2.imp.pkg.version.range>[1.6.1.wso2v10, 2.0.0)</axis2.imp.pkg.version.range>
+ <jzlib.imp.pkg.version.range>[1.0, 2)</jzlib.imp.pkg.version.range>
+ <slf4j.imp.pkg.version.range>[1.6, 2)</slf4j.imp.pkg.version.range>
+ <bouncycastle.imp.pkg.version.range>[1.45.0, 2)</bouncycastle.imp.pkg.version.range>
+ <netty.imp.pkg.version.range>[3.3, 4)</netty.imp.pkg.version.range>
+ <javax.servlet.imp.pkg.version.range>[2.6.0, 3.0.0)</javax.servlet.imp.pkg.version.range>
+ <carbon.platform.imp.pkg.version.range>[4.2.0, 4.3.0)</carbon.platform.imp.pkg.version.range>
+ <carbon.base.imp.pkg.version.range>[1.0.0, 2.0.0)</carbon.base.imp.pkg.version.range>
+ <carbon.user.api.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.user.api.imp.pkg.version.range>
+ <aopalliance.imp.pkg.version.range>[1.0, 2)</aopalliance.imp.pkg.version.range>
+ <guice.imp.pkg.version.range>[3.0, 4.0)</guice.imp.pkg.version.range>
+ <identity.oauth2.imp.pkg.version.range>[4.2.3, 4.3)</identity.oauth2.imp.pkg.version.range>
+ <carbon.kernel.registry.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version.range>
+ <nimbus.jose.jwt.imp.pkg.version.range>[2.26.1, 2.27)</nimbus.jose.jwt.imp.pkg.version.range>
+ <gson.imp.pkg.version.range>[2.3.1, 3.0.0)</gson.imp.pkg.version.range>
+ <commons.lang.imp.pkg.version.range>[2.6.0, 3.0.0)</commons.lang.imp.pkg.version.range>
+ <commons.lang3.imp.pkg.version.range>[3.1, 3.2)</commons.lang3.imp.pkg.version.range>
+ <commons.codec.imp.pkg.version.range>[1.4.0, 2.0.0)</commons.codec.imp.pkg.version.range>
+ <commons.logging.imp.pkg.version.range>[1.1.1, 2.0)</commons.logging.imp.pkg.version.range>
+ <commons.configuration.imp.pkg.version.range>[1.9, 2.0)</commons.configuration.imp.pkg.version.range>
+ <commons.collections.imp.pkg.version.range>[3.2.0, 4.0.0)</commons.collections.imp.pkg.version.range>
+ <opensaml2.imp.pkg.version.range>[2.4.1.wso2v1, 3.0.0)</opensaml2.imp.pkg.version.range>
+ <http.core.imp.pkg.version.range>[4.4.4, 4.5.0)</http.core.imp.pkg.version.range>
+ <http.client.imp.pkg.version.range>[4.5.1, 4.6.0)</http.client.imp.pkg.version.range>
<!-- 3rd party library versions -->
<synapse.wso2.feature.version>2.1.2-wso2v3</synapse.wso2.feature.version>
@@ -630,19 +1645,14 @@
<axis2.wso2.client.version>1.6.1.wso2v10</axis2.wso2.client.version>
<axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
<junit.version>4.11</junit.version>
- <version.commons.logging>1.1.1</version.commons.logging>
- <orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
- <commons-httpclient.version>3.0.1</commons-httpclient.version>
- <json.wso2.version>2.0.0.wso2v1</json.wso2.version>
+ <commons.httpclient.version>3.0.1</commons.httpclient.version>
+ <json.wso2.version>1.0.0.wso2v1</json.wso2.version>
<neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
- <rampart.wso2.version>1.6.1.wso2v9</rampart.wso2.version>
<wsdl4j.wso2.version>1.6.2.wso2v4</wsdl4j.wso2.version>
- <version.commons.logging>1.1.1</version.commons.logging>
<xmlschema.wso2.version>1.4.7.wso2v2</xmlschema.wso2.version>
- <neethi.wso2.version>2.0.4.wso2v4</neethi.wso2.version>
<jclouds.version>1.9.1</jclouds.version>
<kubernetes.api.version>2.2.16</kubernetes.api.version>
- <store.version>1.0.1</store.version>
+ <wso2.store.version>1.0.1</wso2.store.version>
<gson.version>2.3.1</gson.version>
<guice.version>3.0</guice.version>
<guice.assistedinject.version>3.0</guice.assistedinject.version>
@@ -654,34 +1664,109 @@
<slf4j.version>1.7.6</slf4j.version>
<wiremock.version>1.46</wiremock.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
- <json.wso2.version>2.0.0.wso2v1</json.wso2.version>
<kaptcha.wso2.version>2.3.0.wso2v1</kaptcha.wso2.version>
- <rampart.mar.version>1.6.1-wso2v8</rampart.mar.version>
- <opencsv.version>1.8</opencsv.version>
- <poi.version>3.0-FINAL</poi.version>
- <servlet-api.version>2.4</servlet-api.version>
- <log4j.version>1.2.17</log4j.version>
- <commons.logging.version>1.1</commons.logging.version>
- <quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
+ <commons.logging.version>1.1.1</commons.logging.version>
<siddhi.version>2.0.0-wso2v5</siddhi.version>
<siddhi.event.processor.version>1.0.0</siddhi.event.processor.version>
<scr.annotations.version>1.9.12</scr.annotations.version>
<testng.version>6.1.1</testng.version>
<jacoco.agent.version>0.7.4.201502262128</jacoco.agent.version>
<commons.exec.version>1.0.1</commons.exec.version>
- <httpcore.version>4.3.0.wso2v1</httpcore.version>
- <httpclient.version>4.2.5.wso2v1</httpclient.version>
-
- <!-- OSGi import ranges -->
- <axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
- <jzlib.imp.pkg.version>[1.0,2)</jzlib.imp.pkg.version>
- <slf4j.imp.pkg.version>[1.6,2)</slf4j.imp.pkg.version>
- <bouncycastle.imp.pkg.version>[1.45.0,2)</bouncycastle.imp.pkg.version>
- <netty.imp.pkg.version>[3.3,4)</netty.imp.pkg.version>
- <imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
- <carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range>
- <aopalliance.imp.pkg.version>[1.0,2)</aopalliance.imp.pkg.version>
- <guice.imp.pkg.version>[3.0,4.0)</guice.imp.pkg.version>
+ <httpcore.version>4.4.4</httpcore.version>
+ <httpclient.version>4.5.1</httpclient.version>
+ <commons.lang.version>2.6.0.wso2v1</commons.lang.version>
+ <commons.lang3.version>3.1</commons.lang3.version>
+ <commons.configuration.version>1.9</commons.configuration.version>
+ <commons.codec.version>1.4.0.wso2v1</commons.codec.version>
+ <xstream.version>1.4.1</xstream.version>
+ <antlr.version>3.3</antlr.version>
+ <antlr.stringtemplate.version>3.2.1</antlr.stringtemplate.version>
+ <mvel2.version>2.1.3.Final</mvel2.version>
+ <eclipse.ecj.version>3.5.1</eclipse.ecj.version>
+ <xmlpull.version>1.1.3.1</xmlpull.version>
+ <xpp3.version>1.1.4c</xpp3.version>
+ <itext.version>2.1.2</itext.version>
+ <jsr94.version>1.1</jsr94.version>
+ <zip4j.version>1.3.2</zip4j.version>
+ <andes.client.version>0.13.wso2v8</andes.client.version>
+ <slf4j.log4j12.version>1.7.5</slf4j.log4j12.version>
+ <eclipse.jgit.wso2.version>2.3.1.wso2v2</eclipse.jgit.wso2.version>
+ <eclipse.jgit.wso2.osgi.version>2.1.0.wso2v1</eclipse.jgit.wso2.osgi.version>
+ <gitblit.version>1.2.0.wso2v1</gitblit.version>
+ <commons.io.version>2.0</commons.io.version>
+ <commons.io.wso2.version>2.0.0.wso2v1</commons.io.wso2.version>
+ <jdom.wso2.version>1.0.0.wso2v1</jdom.wso2.version>
+ <jsch.version>0.1.49.wso2v1</jsch.version>
+ <commons.cli.version>1.2</commons.cli.version>
+ <jline.version>2.11</jline.version>
+ <commons.validator.version>1.4.0</commons.validator.version>
+ <nimbus.jose.jwt.wso2.version>2.26.1.wso2v2</nimbus.jose.jwt.wso2.version>
+ <opensaml2.version>2.4.1.wso2v1</opensaml2.version>
+ <libthrift.version>0.9.1</libthrift.version>
+ <felix.version>1.0.3</felix.version>
+ <osgi.compendium.version>1.0.0</osgi.compendium.version>
+ <eclipse.equinox.http.servlet.version>2.2.2</eclipse.equinox.http.servlet.version>
+ <eclipse.equinox.http.helper.version>1.0.0</eclipse.equinox.http.helper.version>
+ <equinox.jsp.jasper.version>1.0.1.R33x_v20070816</equinox.jsp.jasper.version>
+ <javax.servlet.jsp.version>2.0.0.v200706191603</javax.servlet.jsp.version>
+ <commons.collections.version>3.2.2.wso2v1</commons.collections.version>
+ <java.xmlbuilder.wso2.version>0.4.wso2v1</java.xmlbuilder.wso2.version>
+ <kubernetes.model.version>1.0.2</kubernetes.model.version>
+ <jackson.version>2.4.1</jackson.version>
+ <cxf.core.version>3.0.4</cxf.core.version>
+ <cxf.rs.client.version>3.0.4</cxf.rs.client.version>
+ <cxf.rt.frontend.jaxrs.version>3.0.4</cxf.rt.frontend.jaxrs.version>
+ <cxf.bundle.version>2.7.7</cxf.bundle.version>
+ <snakeyaml.version>1.5</snakeyaml.version>
+ <json.version>20140107</json.version>
+ <oauth.version>20100527</oauth.version>
+ <dnsjava.version>2.1.7</dnsjava.version>
+ <websocket.client.version>9.1.5.v20140505</websocket.client.version>
+ <jetty.io.version>9.1.5.v20140505</jetty.io.version>
+ <jetty.util.version>9.1.5.v20140505</jetty.util.version>
+ <assertj.core.version>1.7.0</assertj.core.version>
+ <aws.java.sdk.version>1.8.8</aws.java.sdk.version>
+ <velocity.version>1.7</velocity.version>
+ <bcprov.jdk15.version>132</bcprov.jdk15.version>
+ <rampart.version>1.6.1-wso2v8</rampart.version>
+ <hawtbuf.version>1.9</hawtbuf.version>
+ <geronimo.jta_1.1_spec.version>1.1.1</geronimo.jta_1.1_spec.version>
+ <geronimo.jms.version>1.1.1</geronimo.jms.version>
+ <geronimo.j2ee.management_1.1_spec.version>1.0.1</geronimo.j2ee.management_1.1_spec.version>
+ <paho.mqtt.client.version>0.4.0</paho.mqtt.client.version>
+ <activemq.version>5.10.0</activemq.version>
+ <jaggeryjs.version>0.9.0.ALPHA4.wso2v3</jaggeryjs.version>
+ <caramel.version>1.0.1</caramel.version>
+ <netty.version>3.5.9.Final</netty.version>
+ <guava.version>16.0.1</guava.version>
+ <jsch.agentproxy.version>0.0.8</jsch.agentproxy.version>
+ <jsch.agentproxy.sshj.version>0.0.8_1</jsch.agentproxy.sshj.version>
+ <commons.compress.version>1.5</commons.compress.version>
+ <servicemix.bundles.aopalliance.version>1.0_6</servicemix.bundles.aopalliance.version>
+ <aopalliance.version>1.0</aopalliance.version>
+ <servicemix.bundles.javax.inject.version>1_2</servicemix.bundles.javax.inject.version>
+ <jsr311.api.version>1.1.1</jsr311.api.version>
+ <bcprov.jdk16.version>1.45.wso2v1</bcprov.jdk16.version>
+ <servicemix.bundles.jzlib.version>1.1.1_1</servicemix.bundles.jzlib.version>
+ <jna.version>4.1.0</jna.version>
+ <usocket.nc.version>0.0.8</usocket.nc.version>
+ <amber.version>0.22.1358727.wso2v4</amber.version>
+ <spring.version>3.0.7.RELEASE</spring.version>
+ <cxf.xjc.version>2.6.2</cxf.xjc.version>
+ <xmlsec.version>1.5.5</xmlsec.version>
+ <xmlschema.core.version>2.2.1</xmlschema.core.version>
+ <httpcore.nio.version>4.2.4</httpcore.nio.version>
+ <jaxb.impl.version>2.1.13</jaxb.impl.version>
+ <jaxb.xjc.version>2.1.13</jaxb.xjc.version>
+ <woodstox.core.asl.version>4.2.0</woodstox.core.asl.version>
+ <stax2.api.version>3.1.1</stax2.api.version>
+ <jettison.version>1.3.4</jettison.version>
+ <wss4j.version>1.6.11</wss4j.version>
+ <xml.resolver.version>1.2</xml.resolver.version>
+ <ehcache.core.version>2.5.1</ehcache.core.version>
+ <httpasyncclient.version>4.0</httpasyncclient.version>
+ <javax.ws.rs.api.version>2.0.1</javax.ws.rs.api.version>
+ <javax.annotation.api.version>1.2</javax.annotation.api.version>
<!-- product distribution properties -->
<stratos.distribution.name>apache-stratos</stratos.distribution.name>
@@ -715,6 +1800,9 @@
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
<maven.javadoc.plugin.version>2.10.3</maven.javadoc.plugin.version>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
+ <maven.clean.plugin.version>2.4.1</maven.clean.plugin.version>
+ <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
+ <maven.wagon.ssh.extension.version>2.1</maven.wagon.ssh.extension.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/cartridge-agent/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/cartridge-agent/modules/distribution/pom.xml b/products/cartridge-agent/modules/distribution/pom.xml
index 8bb7f24..e0be347 100644
--- a/products/cartridge-agent/modules/distribution/pom.xml
+++ b/products/cartridge-agent/modules/distribution/pom.xml
@@ -34,7 +34,6 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cartridge.agent</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -77,4 +76,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/load-balancer/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml
index bdd2f1e..5761c2c 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -37,48 +37,39 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediator.bridge</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>132</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
<type>mar</type>
- <version>1.6.1-wso2v1</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs.wso2</groupId>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.fusesource.hawtbuf</groupId>
<artifactId>hawtbuf</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>mqtt-client</artifactId>
- <version>0.4.0</version>
</dependency>
</dependencies>
@@ -158,4 +149,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/load-balancer/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/p2-profile-gen/pom.xml b/products/load-balancer/modules/p2-profile-gen/pom.xml
index d18bbbf..f201d35 100755
--- a/products/load-balancer/modules/p2-profile-gen/pom.xml
+++ b/products/load-balancer/modules/p2-profile-gen/pom.xml
@@ -255,12 +255,6 @@
org.wso2.carbon:org.wso2.carbon.endpoint.server.feature:${carbon.kernel.version}
</featureArtifactDef>
<featureArtifactDef>
- org.apache.stratos:org.apache.stratos.load.balancer.feature:${project.version}
- </featureArtifactDef>
- <featureArtifactDef>
- org.apache.stratos:org.apache.stratos.load.balancer.common.feature:${project.version}
- </featureArtifactDef>
- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.sequences.server.feature:${carbon.kernel.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -273,9 +267,6 @@
org.wso2.carbon:org.wso2.carbon.ntask.core.feature:${carbon.kernel.version}
</featureArtifactDef>
<featureArtifactDef>
- org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
- </featureArtifactDef>
- <featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.registry.core.feature:${carbon.kernel.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -299,6 +290,17 @@
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.event.server.feature:${carbon.kernel.version}
</featureArtifactDef>
+
+ <!-- Stratos features -->
+ <featureArtifactDef>
+ org.apache.stratos:org.apache.stratos.load.balancer.feature:${project.version}
+ </featureArtifactDef>
+ <featureArtifactDef>
+ org.apache.stratos:org.apache.stratos.load.balancer.common.feature:${project.version}
+ </featureArtifactDef>
+ <featureArtifactDef>
+ org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
+ </featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@@ -374,6 +376,16 @@
<version>${carbon.kernel.version}</version>
</feature>
<feature>
+ <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+ <version>${carbon.kernel.version}</version>
+ </feature>
+ <feature>
+ <id>org.wso2.carbon.event.server.feature.group</id>
+ <version>${carbon.kernel.version}</version>
+ </feature>
+
+ <!-- Stratos features -->
+ <feature>
<id>org.apache.stratos.messaging.feature.group</id>
<version>${project.version}</version>
</feature>
@@ -385,14 +397,6 @@
<id>org.apache.stratos.load.balancer.common.feature.group</id>
<version>${project.version}</version>
</feature>
- <feature>
- <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
- <version>${carbon.kernel.version}</version>
- </feature>
- <feature>
- <id>org.wso2.carbon.event.server.feature.group</id>
- <version>${carbon.kernel.version}</version>
- </feature>
</features>
</configuration>
</execution>
@@ -420,4 +424,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/pom.xml b/products/load-balancer/pom.xml
index 5858807..e8c0a0c 100755
--- a/products/load-balancer/pom.xml
+++ b/products/load-balancer/pom.xml
@@ -37,32 +37,4 @@
<module>modules/p2-profile-gen</module>
<module>modules/distribution</module>
</modules>
-
- <profiles>
- <profile>
- <id>signed-build</id>
- <activation>
- <property>
- <name>sign</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/python-cartridge-agent/modules/integration/test-common/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-common/pom.xml b/products/python-cartridge-agent/modules/integration/test-common/pom.xml
index 18afa17..4175928 100755
--- a/products/python-cartridge-agent/modules/integration/test-common/pom.xml
+++ b/products/python-cartridge-agent/modules/integration/test-common/pom.xml
@@ -32,19 +32,21 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.wso2.carbon</groupId>
@@ -63,13 +65,13 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
- <version>5.10.0</version>
</dependency>
+
+ <!-- Analytics dependencies -->
<dependency>
<groupId>org.wso2.carbon.analytics-common</groupId>
<artifactId>org.wso2.carbon.databridge.receiver.thrift</artifactId>
@@ -91,4 +93,4 @@
<version>${carbon.analytics.common.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/python-cartridge-agent/modules/integration/test-integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cartridge-agent/modules/integration/test-integration/pom.xml b/products/python-cartridge-agent/modules/integration/test-integration/pom.xml
index 8c67920..47d1de3 100755
--- a/products/python-cartridge-agent/modules/integration/test-integration/pom.xml
+++ b/products/python-cartridge-agent/modules/integration/test-integration/pom.xml
@@ -120,37 +120,30 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.python.cartridge.agent.integration.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jaas</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.wso2.carbon</groupId>
@@ -167,7 +160,8 @@
</exclusions>
</dependency>
</dependencies>
+
<properties>
<suiteFile>${basedir}/src/test/resources/test-suite-all.xml</suiteFile>
</properties>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/python-cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/python-cli/pom.xml b/products/python-cli/pom.xml
index 2b25e77..41f2c6d 100644
--- a/products/python-cli/pom.xml
+++ b/products/python-cli/pom.xml
@@ -19,6 +19,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
@@ -26,7 +27,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>apache-stratos-python-cli-parent</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Python CLI Product</name>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/products/stratos-cli/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-cli/modules/distribution/pom.xml b/products/stratos-cli/modules/distribution/pom.xml
index 68e7c99..80d0814 100644
--- a/products/stratos-cli/modules/distribution/pom.xml
+++ b/products/stratos-cli/modules/distribution/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cli</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -82,4 +81,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
[4/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Posted by ra...@apache.org.
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml
index 3d450f6..82a29da 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -34,42 +34,72 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.stratos.common</artifactId>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.2.2</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
</dependencies>
@@ -89,20 +119,35 @@
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>org.apache.stratos.manager.internal.*</Private-Package>
<Export-Package>
- org.apache.stratos.manager.domain.*,
- org.apache.stratos.manager.utils.*,
- org.apache.stratos.manager.service.*,
+ !org.apache.stratos.manager.internal.*,
+ !org.apache.stratos.manager.service.stub.*,
org.apache.stratos.manager.*
</Export-Package>
<Import-Package>
- org.apache.stratos.cloud.controller.registry.*; version="${project.version}",
- org.apache.axis2.*; version="1.6.1-wso2v10",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- org.apache.stratos.autoscaler.stub; version="${project.version}",
- org.apache.neethi.*; version="2.0.4.wso2v4",
- javax.xml.stream.*; version="1.0.1",
- javax.wsdl.*; version="1.6.2",
- org.osgi.framework.*,
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}",
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.ntask.core.*;version="0.0.0",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}",
+
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.cloud.controller.stub.*;version="${project.version}",
+ org.apache.stratos.autoscaler.stub;version="${project.version}",
+
+ org.wso2.carbon.stratos.common.*;version="${wso2.carbon.stratos.common.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ org.apache.axis2.*; version="${axis2.imp.pkg.version.range}",
+ org.apache.axiom.*; version="${axiom.imp.pkg.version.range}",
+ org.apache.neethi.*; version="${neethi.wso2.version}",
+ javax.wsdl.*; version="${wsdl4j.wso2.version}",
+ org.osgi.framework; version="${osgi.framework.imp.pkg.version.range}",
+ org.osgi.service.component; version="${osgi.service.component.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -127,4 +172,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml b/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml
deleted file mode 100644
index 19b4e78..0000000
--- a/components/org.apache.stratos.manager/src/conf/tenant-resource-policy.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
index e4fa435..3574055 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
@@ -46,8 +46,10 @@ public class StratosManagerContext implements Serializable {
private static final String SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK = "SM_CARTRIDGES_CARTRIDGEGROUPS_WRITE_LOCK";
private static final String SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGES_APPLICATIONS_WRITE_LOCK";
- private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK";
- private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK";
+ private static final String SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK
+ = "SM_CARTRIDGEGROUPS_CARTRIDGESUBGROUPS_WRITE_LOCK";
+ private static final String SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK
+ = "SM_CARTRIDGEGROUPS_APPLICATIONS_WRITE_LOCK";
private static final Log log = LogFactory.getLog(StratosManagerContext.class);
private static volatile StratosManagerContext instance;
private final transient DistributedObjectProvider distributedObjectProvider;
@@ -91,7 +93,8 @@ public class StratosManagerContext implements Serializable {
// Get maps from distributed object provider
cartridgeTypeToCartridgeGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_CARTIDGE_GROUPS_MAP);
cartridgeTypeToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_TYPE_TO_APPLICATIONS_MAP);
- cartridgeGroupToCartridgeSubGroupsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP);
+ cartridgeGroupToCartridgeSubGroupsMap = distributedObjectProvider
+ .getMap(SM_CARTRIDGE_GROUP_TO_CARTIDGE_GROUPS_MAP);
cartridgeGroupToApplicationsMap = distributedObjectProvider.getMap(SM_CARTRIDGE_GROUP_TO_APPLICATIONS_MAP);
// Update context from the registry
@@ -256,7 +259,8 @@ public class StratosManagerContext implements Serializable {
}
}
- public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName, String[] cartridgeGroupNames) {
+ public void removeUsedCartridgeGroupsInCartridgeSubGroups(String cartridgeSubGroupName,
+ String[] cartridgeGroupNames) {
if (cartridgeGroupNames == null) {
return;
}
@@ -343,7 +347,8 @@ public class StratosManagerContext implements Serializable {
copyMap(serializedObj.cartridgeTypeToCartridgeGroupsMap, cartridgeTypeToCartridgeGroupsMap);
copyMap(serializedObj.cartridgeTypeToApplicationsMap, cartridgeTypeToApplicationsMap);
- copyMap(serializedObj.cartridgeGroupToCartridgeSubGroupsMap, cartridgeGroupToCartridgeSubGroupsMap);
+ copyMap(serializedObj.cartridgeGroupToCartridgeSubGroupsMap,
+ cartridgeGroupToCartridgeSubGroupsMap);
copyMap(serializedObj.cartridgeGroupToApplicationsMap, cartridgeGroupToApplicationsMap);
if (log.isDebugEnabled()) {
@@ -356,8 +361,8 @@ public class StratosManagerContext implements Serializable {
}
}
} catch (Exception e) {
- String msg = "Unable to read Stratos Manager context from the registry. " +
- "Hence, any historical data will not be reflected";
+ String msg = "Unable to read Stratos Manager context from the registry. "
+ + "Hence, any historical data will not be reflected";
log.warn(msg, e);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
index 8b464ea..47f401a 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/internal/StratosManagerServiceComponent.java
@@ -155,6 +155,7 @@ public class StratosManagerServiceComponent {
componentStartUpSynchronizer
.waitForAxisServiceActivation(Component.StratosManager, "StratosManagerService");
componentStartUpSynchronizer.setComponentStatus(Component.StratosManager, true);
+
if (log.isInfoEnabled()) {
log.info("Stratos manager component is activated");
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
index e3deed0..86454bf 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/registry/RegistryManager.java
@@ -23,7 +23,7 @@ package org.apache.stratos.manager.registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.internal.ServiceReferenceHolder;
+import org.apache.stratos.manager.internal.ServiceReferenceHolder;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh b/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh
deleted file mode 100644
index 007cc58..0000000
--- a/components/org.apache.stratos.manager/src/scripts/append_zone_file.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-echo "subdomain $1 and ip $2 added to $3"
-appending_file=$3
-subdomain=$1
-ip=$2
-
-#appending the zone file
-echo $subdomain'\t'IN'\t'A'\t'$ip>> $appending_file
-
-#increasing the count
-for file in $appending_file;
-do
- if [ -f $file ];
- then
- OLD=`egrep -ho "2010-9[0-9]*" $file`
- NEW=$(($OLD + 1))
- sed -i "s/$OLD/$NEW/g" $file
- echo "fixed $file"
- fi
-done
-
-
-#reloading bind server
-/etc/init.d/bind9 reload
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.messaging/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml
index a79a3d3..3f2089a 100644
--- a/components/org.apache.stratos.messaging/pom.xml
+++ b/components/org.apache.stratos.messaging/pom.xml
@@ -32,14 +32,33 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -48,48 +67,26 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
+ <groupId>org.wso2.orbit.commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
- <groupId>com.jamesmurty.utils</groupId>
+ <groupId>com.jamesmurty.utils.wso2</groupId>
<artifactId>java-xmlbuilder</artifactId>
- <version>0.6</version>
</dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>mqtt-client</artifactId>
- <version>0.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-client</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -112,15 +109,19 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.messaging,
- org.apache.stratos.messaging.*,
- org.apache.stratos.messaging.topology,
- org.apache.stratos.messaging.topology.*,
- org.apache.stratos.messaging.util.MessagingConstants,
+ org.apache.stratos.messaging.*;version="${project.version}"
</Export-Package>
<Import-Package>
- !org.apache.commons.logging,
- org.apache.commons.logging; version=0.0.0,
+ org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.common.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.collections.*;version="${commons.collections.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -129,4 +130,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml
index 93b42a3..f280c09 100644
--- a/components/org.apache.stratos.metadata.client/pom.xml
+++ b/components/org.apache.stratos.metadata.client/pom.xml
@@ -32,13 +32,15 @@
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.5</version>
+ <artifactId>httpclient-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -61,13 +63,16 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.metadata.client.*,
+ org.apache.stratos.metadata.client.*
</Export-Package>
<Import-Package>
- !org.apache.stratos.metadata.client,
- org.apache.commons.logging; version=0.0.0,
- org.apache.commons.configuration; version=0.0.0,
- org.apache.http.conn.ssl;version=0.0.0,
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}",
+ org.apache.http.auth.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.cookie.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.conn.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.client.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.entity.*;version="${http.client.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -76,4 +81,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml
index 3bd55c1..12f8c72 100644
--- a/components/org.apache.stratos.metadata.service/pom.xml
+++ b/components/org.apache.stratos.metadata.service/pom.xml
@@ -53,105 +53,101 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp/${appName}</directory>
- </resource>
- </webResources>
- <warName>metadata</warName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.7</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.2.2</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.nimbusds.wso2</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1.wso2v2</version>
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp/${appName}</directory>
+ </resource>
+ </webResources>
+ <warName>metadata</warName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
index 2c03b35..27c7da1 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/oauth2/ValidationServiceClient.java
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
+import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken;
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO;
import org.wso2.carbon.utils.CarbonUtils;
@@ -36,24 +37,24 @@ public class ValidationServiceClient {
private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class);
private OAuth2TokenValidationServiceStub stub = null;
- public ValidationServiceClient(String backendServerURL, String username, String password)
- throws Exception {
+ public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception {
String serviceURL = backendServerURL + "OAuth2TokenValidationService";
try {
stub = new OAuth2TokenValidationServiceStub(serviceURL);
- CarbonUtils.setBasicAccessSecurityHeaders(username, password, true,
- stub._getServiceClient());
+ CarbonUtils.setBasicAccessSecurityHeaders(username, password, true, stub._getServiceClient());
} catch (AxisFault e) {
log.error("Error initializing OAuth2 Client");
throw new Exception("Error initializing OAuth Client", e);
}
}
- public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken)
- throws Exception {
+ public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception {
OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
- oauthReq.setAccessToken(accessToken);
- oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
+ OAuth2TokenValidationRequestDTO_OAuth2AccessToken oAuth2AccessToken
+ = new OAuth2TokenValidationRequestDTO_OAuth2AccessToken();
+ oAuth2AccessToken.setIdentifier(accessToken);
+ oAuth2AccessToken.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
+ oauthReq.setAccessToken(oAuth2AccessToken);
try {
return stub.validate(oauthReq);
} catch (RemoteException e) {
@@ -61,5 +62,4 @@ public class ValidationServiceClient {
throw new Exception("Error while validating OAuth2 request", e);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java
index f6b1ee4..7531b16 100644
--- a/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java
+++ b/components/org.apache.stratos.metadata.service/src/main/java/org/apache/stratos/metadata/service/registry/MetadataApiRegistry.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.common.concurrent.locks.ReadWriteLock;
import org.apache.stratos.metadata.service.MetadataTopologyEventReceiver;
+import org.apache.stratos.metadata.service.ServiceHolder;
import org.apache.stratos.metadata.service.definition.Property;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.Registry;
@@ -250,8 +251,7 @@ public class MetadataApiRegistry implements DataStore {
}
private UserRegistry getRegistry() throws RegistryException {
- return org.apache.stratos.common.internal.ServiceReferenceHolder.getInstance().
- getRegistryService().getGovernanceSystemRegistry();
+ return ServiceHolder.getRegistryService().getGovernanceSystemRegistry();
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml
index 0dbbced..b88c6c2 100644
--- a/components/org.apache.stratos.mock.iaas.api/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.api/pom.xml
@@ -41,70 +41,67 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>src/main/webapp/${appName}</directory>
- </resource>
- </webResources>
- <warName>mock-iaas</warName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.2.2</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.mock.iaas</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/main/webapp/${appName}</directory>
+ </resource>
+ </webResources>
+ <warName>mock-iaas</warName>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml
index 8d1c7e8..4fe9b57 100644
--- a/components/org.apache.stratos.mock.iaas.client/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.client/pom.xml
@@ -32,19 +32,42 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.mock.iaas</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.httpcomponents.wso2</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents.wso2</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.axis2.wso2</groupId>
+ <artifactId>axis2-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.3.0.wso2v1</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2.5.wso2v1</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -53,23 +76,15 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
+ <groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.mock.iaas</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -88,14 +103,18 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.mock.iaas.client.*,
+ org.apache.stratos.mock.iaas.client.*
</Export-Package>
- <Private-Package>
- org.apache.stratos.mock.iaas.client.internal;
- </Private-Package>
<Import-Package>
- !org.apache.commons.logging,
- org.apache.commons.logging; version=0.0.0,
+ org.apache.stratos.mock.iaas.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ org.apache.http.auth.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.cookie.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.conn.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.client.*;version="${http.client.imp.pkg.version.range}",
+ org.apache.http.impl.*;version="${http.client.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -104,4 +123,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.mock.iaas/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml
index d78a5a9..cc11078 100644
--- a/components/org.apache.stratos.mock.iaas/pom.xml
+++ b/components/org.apache.stratos.mock.iaas/pom.xml
@@ -33,28 +33,35 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.utils</artifactId>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
</dependencies>
@@ -73,15 +80,22 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.mock.iaas.*,
- org.apache.stratos.mock.iaas.domain.*,
- org.apache.stratos.mock.iaas.services.MockIaasService,
+ !org.apache.stratos.mock.iaas.internal.*,
+ org.apache.stratos.mock.iaas.*
</Export-Package>
<Private-Package>
- org.apache.stratos.mock.iaas.internal;
+ org.apache.stratos.mock.iaas.internal.*
</Private-Package>
<Import-Package>
- org.apache.stratos.common.*,
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.common.*="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index 904c771..1ea6aa7 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -70,49 +70,45 @@
<dependencies>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6.0.wso2v1</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
+ <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-all</artifactId>
- <version>5.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-mqtt</artifactId>
- <version>5.10.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index b846426..2aaeada 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -53,95 +53,93 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>src/main/webapp/${appName}</directory>
- </resource>
- </webResources>
- <warName>api</warName>
- <attachClasses>true</attachClasses>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- Dependency scope is set to provided to avoid dependent jar files being packaged with the war file -->
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle</artifactId>
- <version>2.7.12</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
- <version>2.2.2</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.stratos.common</artifactId>
- <version>2.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.kubernetes.client</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>src/main/webapp/${appName}</directory>
+ </resource>
+ </webResources>
+ <warName>api</warName>
+ <attachClasses>true</attachClasses>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
index ba4c8fd..5148257 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/handlers/ComponentSynchronizerHandler.java
@@ -25,7 +25,7 @@ import org.apache.cxf.message.Message;
import org.apache.stratos.common.Component;
import org.apache.stratos.common.beans.ResponseMessageBean;
import org.apache.stratos.common.services.ComponentStartUpSynchronizer;
-import org.apache.stratos.manager.internal.ServiceReferenceHolder;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
import javax.ws.rs.core.Response;
@@ -35,8 +35,13 @@ import javax.ws.rs.core.Response;
public class ComponentSynchronizerHandler implements RequestHandler {
public Response handleRequest(Message message, ClassResourceInfo classResourceInfo) {
- ComponentStartUpSynchronizer componentStartUpSynchronizer =
- ServiceReferenceHolder.getInstance().getComponentStartUpSynchronizer();
+ PrivilegedCarbonContext carbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+ Object serviceObj = carbonContext.getOSGiService(ComponentStartUpSynchronizer.class);
+ if (serviceObj == null || !(serviceObj instanceof ComponentStartUpSynchronizer)) {
+ throw new RuntimeException("Could not retrieve ComponentSynchronizerHandler OSGi service");
+ }
+
+ ComponentStartUpSynchronizer componentStartUpSynchronizer = (ComponentStartUpSynchronizer) serviceObj;
if (!componentStartUpSynchronizer.isComponentActive(Component.StratosManager)) {
ResponseMessageBean responseBean = new ResponseMessageBean();
responseBean.setMessage("Stratos manager component is not active");
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
index aaf1f5b..cc58b65 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/oauth2/ValidationServiceClient.java
@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.wso2.carbon.identity.oauth2.stub.OAuth2TokenValidationServiceStub;
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO;
+import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationRequestDTO_OAuth2AccessToken;
import org.wso2.carbon.identity.oauth2.stub.dto.OAuth2TokenValidationResponseDTO;
import org.wso2.carbon.utils.CarbonUtils;
@@ -36,7 +37,6 @@ public class ValidationServiceClient {
private OAuth2TokenValidationServiceStub stub = null;
private static final Log log = LogFactory.getLog(OAuth2TokenValidationServiceStub.class);
-
public ValidationServiceClient(String backendServerURL, String username, String password) throws Exception {
String serviceURL = backendServerURL + "OAuth2TokenValidationService";
try {
@@ -48,11 +48,13 @@ public class ValidationServiceClient {
}
}
-
public OAuth2TokenValidationResponseDTO validateAuthenticationRequest(String accessToken) throws Exception {
OAuth2TokenValidationRequestDTO oauthReq = new OAuth2TokenValidationRequestDTO();
- oauthReq.setAccessToken(accessToken);
- oauthReq.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
+ OAuth2TokenValidationRequestDTO_OAuth2AccessToken oAuth2AccessToken
+ = new OAuth2TokenValidationRequestDTO_OAuth2AccessToken();
+ oAuth2AccessToken.setIdentifier(accessToken);
+ oAuth2AccessToken.setTokenType(OAuthConstants.BEARER_TOKEN_TYPE);
+ oauthReq.setAccessToken(oAuth2AccessToken);
try {
return stub.validate(oauthReq);
} catch (RemoteException e) {
@@ -60,6 +62,4 @@ public class ValidationServiceClient {
throw new Exception("Error while validating OAuth2 request", e);
}
}
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/fabric8/kubernetes-api/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/fabric8/kubernetes-api/pom.xml b/dependencies/fabric8/kubernetes-api/pom.xml
index b001325..d60c976 100644
--- a/dependencies/fabric8/kubernetes-api/pom.xml
+++ b/dependencies/fabric8/kubernetes-api/pom.xml
@@ -16,7 +16,7 @@
permissions and limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -37,93 +37,125 @@
<dependencies>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jaxb-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>cxf-utils</artifactId>
- <version>${kubernetes.api.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-model</artifactId>
- <version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.4.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.0.4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.5</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20140107</version>
</dependency>
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
- <version>20100527</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.xmlschema</groupId>
+ <artifactId>xmlschema-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>fabric8-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
- <version>2.1.7</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-client</artifactId>
- <version>9.1.5.v20140505</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>9.1.5.v20140505</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>9.1.5.v20140505</version>
</dependency>
<!-- testing -->
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>1.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.12</version>
<scope>test</scope>
</dependency>
<!-- lets force the codegen to run first -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-codegen</artifactId>
- <version>${kubernetes.api.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -142,7 +174,7 @@
<Export-Package>
io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
- io.fabric8.kubernetes.internal.*
+ io.fabric8.kubernetes.internal.*;version=${kubernetes.api.version}
</Export-Package>
<Import-Package>
!javax.xml.bind.annotation.adapters,
@@ -156,6 +188,7 @@
cxf-rt-rs-client,cxf-rt-transports-http,cxf-rt-frontend-jaxrs,cxf-core,dnsjava
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
+ <Embed-Directory>lib</Embed-Directory>
</instructions>
</configuration>
</plugin>
@@ -176,4 +209,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice-assistedinject/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice-assistedinject/pom.xml b/dependencies/guice-assistedinject/pom.xml
index 0058b3a..76185af 100644
--- a/dependencies/guice-assistedinject/pom.xml
+++ b/dependencies/guice-assistedinject/pom.xml
@@ -36,9 +36,9 @@
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-assistedinject</artifactId>
- <version>${guice.assistedinject.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -53,7 +53,7 @@
</Export-Package>
<Import-Package>
!com.google.inject.assistedinject.*,
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -62,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice-multibindings/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice-multibindings/pom.xml b/dependencies/guice-multibindings/pom.xml
index 8b1c189..3d002e3 100644
--- a/dependencies/guice-multibindings/pom.xml
+++ b/dependencies/guice-multibindings/pom.xml
@@ -36,9 +36,9 @@
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
- <version>${guice.multibindings.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -60,4 +60,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/guice/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/guice/pom.xml b/dependencies/guice/pom.xml
index 6f975fe..89cf949 100644
--- a/dependencies/guice/pom.xml
+++ b/dependencies/guice/pom.xml
@@ -52,7 +52,7 @@
</Export-Package>
<Import-Package>
javax.inject;version="${javax.inject.imp.pkg.version}",
- org.aopalliance*;version="${aopalliance.imp.pkg.version}",
+ org.aopalliance*;version="${aopalliance.imp.pkg.version.range}",
com.google.inject.internal.asm.util.*;resolution:=optional,
*;resolution:=optional
</Import-Package>
@@ -62,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/cloudstack/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/cloudstack/pom.xml b/dependencies/jclouds/cloudstack/pom.xml
index 626f770..2b95424 100644
--- a/dependencies/jclouds/cloudstack/pom.xml
+++ b/dependencies/jclouds/cloudstack/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>cloudstack</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.cloudstack*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/ec2/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/ec2/pom.xml b/dependencies/jclouds/ec2/pom.xml
index f07e922..1a8ec6c 100644
--- a/dependencies/jclouds/ec2/pom.xml
+++ b/dependencies/jclouds/ec2/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>ec2</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.ec2*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
index b4bf11c..021d587 100644
--- a/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/google-cloud-storage/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>google-cloud-storage</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -86,7 +85,7 @@
</Private-Package>
<Import-Package>
org.jclouds.*; version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<Include-Resource>
@@ -98,4 +97,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
index 80c9eed..0af4e36 100644
--- a/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/google-compute-engine/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>google-compute-engine</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -90,7 +89,7 @@
</Private-Package>
<Import-Package>
org.jclouds.*; version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<Include-Resource>
@@ -103,4 +102,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
index 344f1d3..5d4dea5 100644
--- a/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/googlecloud/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>googlecloud</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -57,7 +56,7 @@
</Private-Package>
<Import-Package>
org.jclouds.*; version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<Include-Resource>
@@ -69,4 +68,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
index 7e221b9..2eac9c0 100644
--- a/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
+++ b/dependencies/jclouds/google-jclouds-labs/oauth/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>oauth</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -57,7 +56,7 @@
</Private-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<Include-Resource>
@@ -69,4 +68,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-blobstore/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-blobstore/pom.xml b/dependencies/jclouds/jclouds-blobstore/pom.xml
index 1aae683..c831798 100644
--- a/dependencies/jclouds/jclouds-blobstore/pom.xml
+++ b/dependencies/jclouds/jclouds-blobstore/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-blobstore</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -82,7 +81,7 @@
<Export-Package>org.jclouds.blobstore*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -91,4 +90,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-bouncycastle/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-bouncycastle/pom.xml b/dependencies/jclouds/jclouds-bouncycastle/pom.xml
index cf94e67..c4be8ec 100644
--- a/dependencies/jclouds/jclouds-bouncycastle/pom.xml
+++ b/dependencies/jclouds/jclouds-bouncycastle/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-bouncycastle</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -51,10 +50,11 @@
<instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.jclouds.encryption.bouncycastle*;version="${jclouds.version}"</Export-Package>
+ <Export-Package>org.jclouds.encryption.bouncycastle*;version="${jclouds.version}"
+ </Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +63,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-compute/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-compute/pom.xml b/dependencies/jclouds/jclouds-compute/pom.xml
index 31cf78c..a07126d 100644
--- a/dependencies/jclouds/jclouds-compute/pom.xml
+++ b/dependencies/jclouds/jclouds-compute/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -87,7 +86,7 @@
</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -96,4 +95,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-core/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-core/pom.xml b/dependencies/jclouds/jclouds-core/pom.xml
index 6db6245..4e5ac81 100644
--- a/dependencies/jclouds/jclouds-core/pom.xml
+++ b/dependencies/jclouds/jclouds-core/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -83,7 +82,7 @@
<Export-Package>org.jclouds*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.nnsoft.guice.rocoto*;version="${rocoto.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<Bundle-Activator>org.jclouds.osgi.Activator</Bundle-Activator>
@@ -93,4 +92,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/dependencies/jclouds/jclouds-enterprise/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/jclouds-enterprise/pom.xml b/dependencies/jclouds/jclouds-enterprise/pom.xml
index d2e817e..5401ad4 100644
--- a/dependencies/jclouds/jclouds-enterprise/pom.xml
+++ b/dependencies/jclouds/jclouds-enterprise/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
@@ -54,7 +53,7 @@
<Export-Package>org.jclouds.enterprise*;version="${jclouds.version}"</Export-Package>
<Import-Package>
org.jclouds*;version="${jclouds.version}",
- com.google.inject.*;version="${guice.imp.pkg.version}",
+ com.google.inject.*;version="${guice.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -63,4 +62,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
[5/5] stratos git commit: Closing STRATOS-1623: pom refactoring,
fix OSGi imports/exports
Posted by ra...@apache.org.
Closing STRATOS-1623: pom refactoring, fix OSGi imports/exports
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a5a7aba0
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a5a7aba0
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a5a7aba0
Branch: refs/heads/stratos-4.1.x
Commit: a5a7aba0b56b8aeeee17ed8c3f619db45863019c
Parents: e687ada
Author: Akila Perera <ra...@gmail.com>
Authored: Tue Nov 17 22:01:49 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Tue Nov 17 22:01:49 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.autoscaler/pom.xml | 186 +--
.../networkpartition/AllAtOnceAlgorithm.java | 2 +-
.../autoscaler/internal/ASBundleActivater.java | 41 -
.../org.apache.stratos.cartridge.agent/pom.xml | 41 +-
components/org.apache.stratos.cli/pom.xml | 18 +-
.../org.apache.stratos.cloud.controller/pom.xml | 224 ++--
.../internal/ServiceReferenceHolder.java | 4 +-
.../controller/registry/RegistryManager.java | 4 +-
components/org.apache.stratos.common/pom.xml | 129 +-
.../org.apache.stratos.custom.handlers/pom.xml | 67 +-
.../pom.xml | 31 +-
.../pom.xml | 49 +-
.../pom.xml | 4 +-
.../org.apache.stratos.load.balancer/pom.xml | 70 +-
.../org.apache.stratos.manager.styles/pom.xml | 80 +-
components/org.apache.stratos.manager/pom.xml | 99 +-
.../src/conf/tenant-resource-policy.xml | 22 -
.../manager/context/StratosManagerContext.java | 19 +-
.../StratosManagerServiceComponent.java | 1 +
.../manager/registry/RegistryManager.java | 2 +-
.../src/scripts/append_zone_file.sh | 44 -
components/org.apache.stratos.messaging/pom.xml | 69 +-
.../org.apache.stratos.metadata.client/pom.xml | 23 +-
.../org.apache.stratos.metadata.service/pom.xml | 82 +-
.../service/oauth2/ValidationServiceClient.java | 18 +-
.../service/registry/MetadataApiRegistry.java | 4 +-
.../org.apache.stratos.mock.iaas.api/pom.xml | 65 +-
.../org.apache.stratos.mock.iaas.client/pom.xml | 65 +-
components/org.apache.stratos.mock.iaas/pom.xml | 40 +-
.../pom.xml | 30 +-
.../org.apache.stratos.rest.endpoint/pom.xml | 76 +-
.../handlers/ComponentSynchronizerHandler.java | 11 +-
.../oauth2/ValidationServiceClient.java | 12 +-
dependencies/fabric8/kubernetes-api/pom.xml | 73 +-
dependencies/guice-assistedinject/pom.xml | 6 +-
dependencies/guice-multibindings/pom.xml | 4 +-
dependencies/guice/pom.xml | 4 +-
dependencies/jclouds/cloudstack/pom.xml | 5 +-
dependencies/jclouds/ec2/pom.xml | 5 +-
.../google-cloud-storage/pom.xml | 5 +-
.../google-compute-engine/pom.xml | 5 +-
.../google-jclouds-labs/googlecloud/pom.xml | 5 +-
.../jclouds/google-jclouds-labs/oauth/pom.xml | 5 +-
dependencies/jclouds/jclouds-blobstore/pom.xml | 5 +-
.../jclouds/jclouds-bouncycastle/pom.xml | 8 +-
dependencies/jclouds/jclouds-compute/pom.xml | 5 +-
dependencies/jclouds/jclouds-core/pom.xml | 5 +-
dependencies/jclouds/jclouds-enterprise/pom.xml | 5 +-
dependencies/jclouds/jclouds-joda/pom.xml | 5 +-
dependencies/jclouds/jclouds-netty/pom.xml | 7 +-
dependencies/jclouds/jclouds-sshj/pom.xml | 5 +-
dependencies/jclouds/openstack-common/pom.xml | 5 +-
dependencies/jclouds/openstack-keystone/pom.xml | 5 +-
dependencies/jclouds/openstack-neutron/pom.xml | 5 +-
dependencies/jclouds/openstack-nova/pom.xml | 5 +-
dependencies/jclouds/sts/pom.xml | 5 +-
dependencies/org.wso2.carbon.ui/pom.xml | 2 +-
dependencies/rocoto/pom.xml | 5 +-
dependencies/sshj/pom.xml | 9 +-
.../stratos-cep-extension/wso2cep-3.0.0/pom.xml | 15 +-
.../stratos-cep-extension/wso2cep-3.1.0/pom.xml | 15 +-
.../artifacts/metering-dashboard/capps/pom.xml | 8 +-
.../monitoring-dashboard/capps/pom.xml | 8 +-
extensions/das/pom.xml | 5 +-
.../load-balancer/modules/aws-extension/pom.xml | 15 +-
.../modules/haproxy-extension/pom.xml | 9 +-
.../load-balancer/modules/lvs-extension/pom.xml | 9 +-
.../modules/nginx-extension/pom.xml | 9 +-
.../pom.xml | 34 +-
.../pom.xml | 6 +-
.../pom.xml | 8 +-
.../pom.xml | 90 +-
.../org.apache.stratos.common.feature/pom.xml | 4 +-
.../pom.xml | 12 +-
.../pom.xml | 15 +-
.../pom.xml | 8 +-
.../pom.xml | 27 +-
.../pom.xml | 19 +-
.../pom.xml | 195 ---
.../pom.xml | 196 +--
.../pom.xml | 28 +-
.../pom.xml | 5 +-
.../pom.xml | 20 +-
.../pom.xml | 69 +-
features/pom.xml | 14 +-
pom.xml | 1166 +++++++++++++++++-
.../modules/distribution/pom.xml | 3 +-
.../load-balancer/modules/distribution/pom.xml | 13 +-
.../modules/p2-profile-gen/pom.xml | 40 +-
products/load-balancer/pom.xml | 30 +-
.../modules/integration/test-common/pom.xml | 14 +-
.../integration/test-integration/pom.xml | 10 +-
products/python-cli/pom.xml | 2 +-
.../stratos-cli/modules/distribution/pom.xml | 3 +-
products/stratos/modules/distribution/pom.xml | 13 +-
.../distribution/src/main/conf/etc/launch.ini | 26 +-
.../modules/integration/test-common/pom.xml | 23 +-
.../integration/test-integration/pom.xml | 18 +-
products/stratos/modules/p2-profile-gen/pom.xml | 219 ++--
products/stratos/pom.xml | 30 +-
service-stubs/pom.xml | 12 +-
101 files changed, 2523 insertions(+), 1777 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.autoscaler/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/pom.xml b/components/org.apache.stratos.autoscaler/pom.xml
index 9e95472..1a74b82 100644
--- a/components/org.apache.stratos.autoscaler/pom.xml
+++ b/components/org.apache.stratos.autoscaler/pom.xml
@@ -35,153 +35,142 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.kernel.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-compiler</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
- <groupId>org.antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>3.3</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.drools</groupId>
- <artifactId>drools-decisiontables</artifactId>
- <version>${drools.version}</version>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
- <version>3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-decisiontables</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>stringtemplate</artifactId>
- <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-jsr94</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>knowledge-internal-api</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>knowledge-api</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>2.1.3.Final</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
- <version>${drools.version}</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-templates</artifactId>
- <version>${drools.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt.core.compiler</groupId>
- <artifactId>ecj</artifactId>
- <version>3.5.1</version>
</dependency>
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
- <version>1.1.3.1</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
- <version>1.1.4c</version>
- </dependency>
- <dependency>
- <groupId>com.lowagie</groupId>
- <artifactId>itext</artifactId>
- <version>2.1.2</version>
</dependency>
<dependency>
- <groupId>jsr94</groupId>
- <artifactId>jsr94</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>com.nimbusds.wso2</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ntask.core</artifactId>
- <scope>provided</scope>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth</artifactId>
- <version>4.2.3</version>
+ <groupId>jsr94</groupId>
+ <artifactId>jsr94</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>4.2.3</version>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel2</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.application.mgt.stub</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
</dependency>
<dependency>
- <groupId>com.nimbusds.wso2</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1.wso2v2</version>
+ <groupId>org.apache.amber.wso2</groupId>
+ <artifactId>amber</artifactId>
</dependency>
</dependencies>
@@ -200,21 +189,39 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Private-Package>org.apache.stratos.autoscaler.internal.*</Private-Package>
- <Export-Package>!org.apache.stratos.autoscaler.internal.*,org.apache.stratos.autoscaler.*
+ <Export-Package>
+ !org.apache.stratos.autoscaler.internal.*,
+ !org.apache.stratos.autoscaler.stub.*,
+ org.apache.stratos.autoscaler.*
</Export-Package>
<Import-Package>
- org.apache.stratos.common.services.*; version="${project.version}",
- org.apache.stratos.common.threading.*; version="${project.version}",
- org.apache.stratos.common.client.*; version="${project.version}",
- org.apache.stratos.common.partition.*; version="${project.version}",
- org.apache.stratos.common.constants.*; version="${project.version}",
- org.apache.stratos.common.*; version="${project.version}",
- org.apache.stratos.cloud.controller.stub.*; version="${project.version}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.identity.application.mgt.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth.stub.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.ntask.core.*;version="0.0.0",
+
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.cloud.controller.stub.*;version="${project.version}",
+
+ org.apache.commons.logging.*; version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ com.nimbusds.jose.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ com.nimbusds.jwt.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ org.apache.amber.*;version="${amber.version}"
*;resolution:=optional
</Import-Package>
- <Bundle-Activator>org.apache.stratos.autoscaler.internal.ASBundleActivater</Bundle-Activator>
<DynamicImport-Package>*</DynamicImport-Package>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Dependency>
+ antlr,antlr-runtime,drools-compiler,drools-core,drools-decisiontables,drools-jsr94,
+ drools-templates,drools-verifier,ecj,itext,jsr94,knowledge-api,knowledge-internal-api,
+ stringtemplate,xmlpull,xpp3_min,xstream;scope=compile|runtime
+ </Embed-Dependency>
<Embed-Directory>lib</Embed-Directory>
</instructions>
</configuration>
@@ -236,6 +243,7 @@
</executions>
</plugin>
</plugins>
+
<resources>
<resource>
<directory>src/main/rules</directory>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
index 3d5dc24..f1b52f7 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/algorithms/networkpartition/AllAtOnceAlgorithm.java
@@ -18,11 +18,11 @@
*/
package org.apache.stratos.autoscaler.algorithms.networkpartition;
-import edu.emory.mathcs.backport.java.util.Arrays;
import org.apache.stratos.autoscaler.algorithms.NetworkPartitionAlgorithm;
import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
import org.apache.stratos.autoscaler.pojo.policy.deployment.ApplicationPolicy;
+import java.util.Arrays;
import java.util.List;
public class AllAtOnceAlgorithm implements NetworkPartitionAlgorithm {
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
deleted file mode 100644
index 0ae2a61..0000000
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/ASBundleActivater.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.stratos.autoscaler.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class ASBundleActivater implements BundleActivator {
-
- private static final Log log = LogFactory.getLog(ASBundleActivater.class);
-
- @Override
- public void start(BundleContext context) throws Exception {
- if (log.isDebugEnabled())
- log.debug("AutoScaler bundle is activated.");
- }
-
- @Override
- public void stop(BundleContext context) throws Exception {
- if (log.isDebugEnabled())
- log.debug("AutoScaler bundle is deActivated.");
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 07cef19..0f45bbf 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -31,43 +31,26 @@
<name>Apache Stratos - Cartridge Agent</name>
<description>Apache Stratos Cartridge Agent</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>net.lingala.zip4j</groupId>
<artifactId>zip4j</artifactId>
- <version>1.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.andes.wso2</groupId>
<artifactId>andes-client</artifactId>
- <version>0.13.wso2v8</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs.wso2</groupId>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -76,37 +59,43 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit.wso2</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>2.3.1.wso2v2</version>
+ <version>${eclipse.jgit.wso2.version}</version>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
- <version>0.1.49.wso2v1</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index e5add46..e05709a 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -36,58 +36,47 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.securevault</groupId>
<artifactId>org.wso2.securevault</artifactId>
- <version>1.0.0-wso2v2</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents.wso2</groupId>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.3.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>2.11</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.1</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -97,14 +86,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -266,4 +254,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index c330e21..69ff89f 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -17,7 +17,7 @@
# specific language governing permissions and limitations
# under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,199 +30,221 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Cloud Controller</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- !org.apache.stratos.cloud.controller.internal.*,
- !org.apache.stratos.cloud.controller.stub.*,
- org.apache.stratos.cloud.controller.*,
- </Export-Package>
- <Private-Package>
- org.apache.stratos.cloud.controller.internal.*,
- </Private-Package>
- <Import-Package>
- !org.apache.stratos.cloud.controller.*,
- org.apache.stratos.mock.iaas.*,
- org.apache.commons.*,
- org.wso2.carbon.utils.*,
- org.apache.stratos.common.*; version="${project.version}",
- org.apache.stratos.kubernetes.client.*; version="${project.version}",
- org.jclouds.aws.ec2.*; version=${jclouds.version},
- org.jclouds.ec2.*; version=${jclouds.version},
- org.jclouds.compute.*; version=${jclouds.version},
- org.jclouds.domain.*; version=${jclouds.version},
- org.jclouds.googlecomputeengine*; version=${jclouds.version},
- org.jclouds.googlecloud.*; version=${jclouds.version},
- org.jclouds*; version=${jclouds.version},
- *; resolution:=optional
- </Import-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
- <Axis2Deployer>CloudControllerDeployer</Axis2Deployer>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <configuration>
- <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
- <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
- <serviceName>CloudControllerService</serviceName>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>java2wsdl</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.kubernetes.client</artifactId>
- <version>${project.version}</version>
+ <groupId>org.wso2.securevault</groupId>
+ <artifactId>org.wso2.securevault</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.securevault</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.ntask.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.analytics.hive.stub</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.messaging</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.kubernetes.client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.mock.iaas</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.mock.iaas.client</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<!-- jclouds dependencies -->
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>cloudstack</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-enterprise</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>ec2</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>aws-ec2</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-nova</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.labs</groupId>
<artifactId>openstack-neutron</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.api</groupId>
<artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>google-compute-engine</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jclouds.driver</groupId>
<artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Export-Package>
+ !org.apache.stratos.cloud.controller.internal.*,
+ !org.apache.stratos.cloud.controller.stub.*,
+ org.apache.stratos.cloud.controller.*
+ </Export-Package>
+ <Private-Package>
+ org.apache.stratos.cloud.controller.internal.*
+ </Private-Package>
+ <Import-Package>
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.securevault.*;version="0.0.0",
+ org.wso2.carbon.ntask.core.*;version="0.0.0",
+ org.wso2.carbon.caching.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.mock.iaas.*;version="${project.version}",
+ org.apache.stratos.mock.iaas.client.*;version="${project.version}",
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.kubernetes.client.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ com.google.gson.*;version="${gson.imp.pkg.version.range}",
+ io.fabric8.kubernetes.*;version=${kubernetes.api.version},
+ org.jclouds.aws.ec2.*;version=${jclouds.version},
+ org.jclouds.ec2.*;version=${jclouds.version},
+ org.jclouds.compute.*;version=${jclouds.version},
+ org.jclouds.domain.*;version=${jclouds.version},
+ org.jclouds.googlecomputeengine*;version=${jclouds.version},
+ org.jclouds.googlecloud.*;version=${jclouds.version},
+ org.jclouds*;version=${jclouds.version},
+ *; resolution:=optional
+ </Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ <Axis2Deployer>CloudControllerDeployer</Axis2Deployer>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl-maven-plugin</artifactId>
+ <configuration>
+ <className>org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl</className>
+ <outputFileName>target/generated-resources/wsdl/CloudControllerService.wsdl</outputFileName>
+ <serviceName>CloudControllerService</serviceName>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java2wsdl</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
index bd3485f..ff65c1c 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/ServiceReferenceHolder.java
@@ -34,7 +34,7 @@ public class ServiceReferenceHolder {
private static volatile ServiceReferenceHolder instance;
private TaskService taskService;
- private Registry registry;
+ private UserRegistry registry;
private AxisConfiguration axisConfiguration;
private DistributedObjectProvider distributedObjectProvider;
private HazelcastInstance hazelcastInstance;
@@ -74,7 +74,7 @@ public class ServiceReferenceHolder {
registry = governanceSystemRegistry;
}
- public Registry getRegistry() {
+ public UserRegistry getRegistry() {
return registry;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
index b935eaa..750a0be 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/registry/RegistryManager.java
@@ -23,7 +23,7 @@ package org.apache.stratos.cloud.controller.registry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.common.internal.ServiceReferenceHolder;
+import org.apache.stratos.cloud.controller.internal.ServiceReferenceHolder;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.registry.core.Registry;
import org.wso2.carbon.registry.core.Resource;
@@ -141,7 +141,7 @@ public class RegistryManager {
}
private UserRegistry getRegistry() throws RegistryException {
- return ServiceReferenceHolder.getInstance().getRegistryService().getGovernanceSystemRegistry();
+ return ServiceReferenceHolder.getInstance().getRegistry();
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.common/pom.xml b/components/org.apache.stratos.common/pom.xml
index e9047fc..4da58c3 100644
--- a/components/org.apache.stratos.common/pom.xml
+++ b/components/org.apache.stratos.common/pom.xml
@@ -29,104 +29,121 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Common</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Export-Package>
- org.apache.stratos.common.*,
- org.apache.stratos.common.constants.*,
- org.apache.stratos.common.domain.*,
- org.apache.stratos.common.client.*,
- org.apache.stratos.common.services.*,
- org.apache.stratos.common.statistics.publisher.*,
- org.apache.stratos.common.concurrent.locks.*,
- </Export-Package>
- <Import-Package>
- org.wso2.carbon.registry.core.*;version=1.0.1,
- org.wso2.carbon.user.core.*,
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.axiom.*; version="${axiom.osgi.version.range}",
- *;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.core</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.user.mgt</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.securevault</groupId>
+ <artifactId>org.wso2.securevault</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.cloud.controller.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.autoscaler.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.manager.service.stub</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6.0.wso2v1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Private-Package>org.apache.stratos.common.internal.*</Private-Package>
+ <Export-Package>
+ !org.apache.stratos.common.internal.*,
+ org.apache.stratos.common.*
+ </Export-Package>
+ <Import-Package>
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.user.mgt.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.commons.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.databridge.agent.thrift.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}",
+ org.wso2.securevault.*;version="0.0.0",
+
+ org.apache.stratos.cloud.controller.service.stub.*;version="${project.version}",
+ org.apache.stratos.autoscaler.service.stub.*;version="${project.version}",
+ org.apache.stratos.manager.service.stub.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.configuration.*;version="${commons.configuration.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ org.apache.axiom.*; version="${axiom.imp.pkg.version.range}",
+ *;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.custom.handlers/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.custom.handlers/pom.xml b/components/org.apache.stratos.custom.handlers/pom.xml
index 6600033..c4e3218 100644
--- a/components/org.apache.stratos.custom.handlers/pom.xml
+++ b/components/org.apache.stratos.custom.handlers/pom.xml
@@ -33,55 +33,56 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.oauth</artifactId>
- <version>4.2.3</version>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
</dependency>
<dependency>
- <groupId>com.nimbusds</groupId>
- <artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.api</artifactId>
</dependency>
<dependency>
- <groupId>net.minidev</groupId>
- <artifactId>json-smart</artifactId>
- <version>1.3</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.base</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.identity.oauth</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.logging</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core.common</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.core</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core.services</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>opensaml.wso2</groupId>
<artifactId>opensaml2</artifactId>
- <version>2.4.1.wso2v1</version>
</dependency>
<dependency>
<groupId>com.nimbusds.wso2</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>2.26.1.wso2v2</version>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
@@ -98,21 +99,31 @@
${project.artifactId}
</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Private-Package>org.apache.stratos.custom.handlers.internal.*</Private-Package>
+ <Export-Package>
+ !org.apache.stratos.custom.handlers.internal.*,
+ org.apache.stratos.custom.handlers.*
+ </Export-Package>
<Import-Package>
- org.wso2.carbon.identity.oauth2.*; version="4.2.3",
+ org.wso2.carbon.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.base.*;version="${carbon.base.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth2.*;version="${identity.oauth2.imp.pkg.version.range}",
+ org.wso2.carbon.identity.oauth.*;version="${identity.oauth2.imp.pkg.version.range}",
+ org.wso2.carbon.user.api.*;version="${carbon.user.api.imp.pkg.version.range}",
+
+ org.apache.commons.logging.*; version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.opensaml.*;version="${opensaml2.imp.pkg.version.range}",
+ com.nimbusds.jose.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
+ com.nimbusds.jwt.*;version="${nimbus.jose.jwt.imp.pkg.version.range}",
*;resolution:=optional,
</Import-Package>
- <Export-Package>
- !org.wso2.carbon.identity.authenticator.signedjwt.internal,
- org.apache.stratos.custom.handlers.*,
- </Export-Package>
- <Embed-Dependency>
- nimbus-jose-jwt|json-smart;scope=compile|runtime;inline=false
- </Embed-Dependency>
- <!--<DynamicImport-Package>*</DynamicImport-Package>-->
</instructions>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.kubernetes.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/pom.xml b/components/org.apache.stratos.kubernetes.client/pom.xml
index 2b25017..38c45bd 100644
--- a/components/org.apache.stratos.kubernetes.client/pom.xml
+++ b/components/org.apache.stratos.kubernetes.client/pom.xml
@@ -34,26 +34,26 @@
<dependencies>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.logging</artifactId>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>kubernetes-api</artifactId>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>kubernetes-api</artifactId>
- <version>${kubernetes.api.version}</version>
- </dependency>
</dependencies>
<build>
@@ -67,10 +67,11 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.kubernetes.client,
- org.apache.stratos.kubernetes.client.exceptions,
+ org.apache.stratos.kubernetes.client.*
</Export-Package>
<Import-Package>
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
io.fabric8.kubernetes.api.*;version=${kubernetes.api.version},
io.fabric8.kubernetes.api.model.*;version=${kubernetes.api.version},
*;resolution:=optional
@@ -131,4 +132,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.load.balancer.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.common/pom.xml b/components/org.apache.stratos.load.balancer.common/pom.xml
index 83686f9..27626c1 100644
--- a/components/org.apache.stratos.load.balancer.common/pom.xml
+++ b/components/org.apache.stratos.load.balancer.common/pom.xml
@@ -33,43 +33,40 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.core</artifactId>
- <version>${carbon.kernel.version}</version>
+ <artifactId>org.wso2.carbon.utils</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
+
+ <!-- Stratos components -->
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.common</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
+
+ <!-- Misc -->
<dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.9.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.agent.thrift</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${carbon.kernel.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -88,15 +85,21 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.load.balancer.common.*,
+ !org.apache.stratos.load.balancer.common.internal.*,
+ org.apache.stratos.load.balancer.common.*
</Export-Package>
<Private-Package>
- org.apache.stratos.load.balancer.common.internal;
+ org.apache.stratos.load.balancer.common.internal.*
</Private-Package>
<Import-Package>
- !org.apache.commons.logging,
- org.apache.commons.logging; version=0.0.0,
- org.apache.stratos.common,
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.common.*; version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -105,4 +108,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.load.balancer.extension.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer.extension.api/pom.xml b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
index a645ad8..ec765e1 100644
--- a/components/org.apache.stratos.load.balancer.extension.api/pom.xml
+++ b/components/org.apache.stratos.load.balancer.extension.api/pom.xml
@@ -34,12 +34,10 @@
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.common</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.load.balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/pom.xml b/components/org.apache.stratos.load.balancer/pom.xml
index 8d6674f..498d848 100644
--- a/components/org.apache.stratos.load.balancer/pom.xml
+++ b/components/org.apache.stratos.load.balancer/pom.xml
@@ -33,23 +33,59 @@
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.registry.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.user.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.initializer</artifactId>
- <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.mediation.dependency.mgt</artifactId>
- <version>${carbon.kernel.version}</version>
+ </dependency>
+
+ <!-- Stratos components -->
+ <dependency>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>org.apache.stratos.common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.messaging</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
<artifactId>org.apache.stratos.load.balancer.common</artifactId>
- <version>${project.version}</version>
+ </dependency>
+
+ <!-- Misc -->
+ <dependency>
+ <groupId>commons-codec.wso2</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang.wso2</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wso2.orbit.commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
</dependencies>
@@ -68,13 +104,27 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
- org.apache.stratos.load.balancer.endpoint,
- org.apache.stratos.load.balancer,
- org.apache.stratos.load.balancer.topology,
- org.apache.stratos.load.balancer.mediators,
+ !org.apache.stratos.load.balancer.internal.*,
+ org.apache.stratos.load.balancer.*
</Export-Package>
+ <Private-Package>
+ org.apache.stratos.load.balancer.internal.*
+ </Private-Package>
<Import-Package>
- org.wso2.carbon.registry.core.service; version=1.0.1,
+ org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version.range}",
+ org.wso2.carbon.user.core.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.utils.*;version="${carbon.platform.imp.pkg.version.range}",
+ org.wso2.carbon.mediation.*;version="${carbon.platform.imp.pkg.version.range}",
+
+ org.apache.stratos.common.*;version="${project.version}",
+ org.apache.stratos.messaging.*;version="${project.version}",
+ org.apache.stratos.load.balancer.common.*;version="${project.version}",
+
+ org.apache.commons.logging.*;version="${commons.logging.imp.pkg.version.range}",
+ org.apache.commons.lang.*;version="${commons.lang.imp.pkg.version.range}",
+ org.apache.commons.lang3.*;version="${commons.lang3.imp.pkg.version.range}",
+ org.apache.commons.codec.*;version="${commons.codec.imp.pkg.version.range}",
+ org.apache.commons.collections.*;version="${commons.collections.imp.pkg.version.range}",
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -83,4 +133,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/a5a7aba0/components/org.apache.stratos.manager.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/pom.xml b/components/org.apache.stratos.manager.styles/pom.xml
index c6d9bac..3c1f8d8 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -31,6 +31,41 @@
<packaging>bundle</packaging>
<name>Apache Stratos - Cloud Manager UI styles</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.wso2.carbon</groupId>
+ <artifactId>org.wso2.carbon.ui</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.http.helper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -66,47 +101,4 @@
</resource>
</resources>
</build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.servlet</artifactId>
- <version>2.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.http.helper</artifactId>
- <version>1.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
- <version>1.0.1.R33x_v20070816</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>2.0.0.v200706191603</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+</project>