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/08/26 05:39:30 UTC
[1/2] stratos git commit: Cleaning up filters resources and
distribution properties
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 0c93e47eb -> 57ecc648e
Cleaning up filters resources and distribution properties
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/71481d35
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/71481d35
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/71481d35
Branch: refs/heads/stratos-4.1.x
Commit: 71481d354ba8b1c7ce3d27c31e5b896771414c31
Parents: 0c93e47
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Aug 26 00:16:54 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Aug 26 00:16:54 2015 +0530
----------------------------------------------------------------------
.../cep/distribution/src/assembly/bin.xml | 8 +-
pom.xml | 4 +
.../load-balancer/modules/distribution/pom.xml | 3 +-
.../distribution/src/main/assembly/bin.xml | 121 +++++++------------
.../src/main/assembly/filter.properties | 7 +-
products/stratos/modules/distribution/pom.xml | 6 +-
.../distribution/src/assembly/filter.properties | 2 -
.../distribution/src/main/conf/axis2/axis2.xml | 8 +-
.../distribution/src/main/conf/carbon.xml | 2 +-
products/stratos/modules/integration/pom.xml | 6 +
.../test-conf/integration-test.properties | 21 ++++
11 files changed, 90 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/extensions/cep/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/extensions/cep/distribution/src/assembly/bin.xml b/extensions/cep/distribution/src/assembly/bin.xml
index e4599ab..509a6e2 100755
--- a/extensions/cep/distribution/src/assembly/bin.xml
+++ b/extensions/cep/distribution/src/assembly/bin.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<directory>../artifacts/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+ <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
<includes>
<include>**/*.xml</include>
</includes>
@@ -39,19 +39,19 @@
<files>
<file>
<source>${project.basedir}/README.md</source>
- <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+ <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/notice/NOTICE</source>
- <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+ <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/license/LICENSE</source>
- <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
+ <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a5cacb..9ba2735 100644
--- a/pom.xml
+++ b/pom.xml
@@ -735,6 +735,10 @@
<aopalliance.imp.pkg.version>[1.0,2)</aopalliance.imp.pkg.version>
<guice.imp.pkg.version>[3.0,4.0)</guice.imp.pkg.version>
+ <!-- product distribution properties -->
+ <stratos.distribution.name>apache-stratos</stratos.distribution.name>
+ <load.balancer.distribution.name>apache-stratos-load-balancer</load.balancer.distribution.name>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/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 3ac2692..abb1516 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -28,7 +28,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>apache-stratos-load-balancer</artifactId>
+ <artifactId>load-balancer-distribution</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - Load Balancer - Distribution</name>
<description>Apache Stratos Load Balancer Distribution</description>
@@ -144,6 +144,7 @@
<goal>attached</goal>
</goals>
<configuration>
+ <finalName>${load.balancer.distribution.name}-${project.version}</finalName>
<filters>
<filter>${basedir}/src/main/assembly/filter.properties</filter>
</filters>
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index 6c0fc1e..e96c930 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
<exclude>**/*.bat</exclude>
@@ -69,7 +69,7 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude>
@@ -83,33 +83,25 @@
<exclude>**/plugins/marshalling_1.3.6.wso2v1.jar</exclude>
</excludes>
</fileSet>
- <!-- get axis2_1.6.1.wso2v9.jar from carbon kernel patch 0002 -->
- <!--fileSet>
- <directory>../p2-profile/target/WSO2-CARBON-PATCH-4.1.0-0002/</directory>
- <outputDirectory>${pom.artifactId}-${pom.version}/repository/components/patches</outputDirectory>
- <includes>
- <include>**/patch0002/axis2_1.6.1.wso2v9.jar</include>
- </includes>
- </fileSet-->
<fileSet>
<directory>src/main/conf/synapse-configs</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/synapse-configs
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/synapse-configs
</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/cartridges</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/cartridges
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/cartridges
</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/services</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/server/services
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/services
</outputDirectory>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/
</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/etc</outputDirectory>
<includes>
<include>*.xsd</include>
</includes>
@@ -118,56 +110,56 @@
<!-- Kernel Patches-->
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0001/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gentarget/WSO2-CARBON-PATCH-4.2.0-0002</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0003/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0004/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0005/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0006/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0007/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0008/*.*</include>
</includes>
@@ -177,13 +169,13 @@
<dependencySets>
<!-- use the new tool to create a bundles -->
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/lib/core/WEB-INF/lib</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/lib/core/WEB-INF/lib</outputDirectory>
<includes>
<include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/axis2/client/lib</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/axis2/client/lib</outputDirectory>
<includes>
<include>bouncycastle:bcprov-jdk15:jar</include>
</includes>
@@ -191,7 +183,7 @@
</outputFileNameMapping>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/deployment/client/modules
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/client/modules
</outputDirectory>
<includes>
<include>org.apache.rampart:rampart:mar</include>
@@ -199,14 +191,14 @@
</dependencySet>
<!-- MB Client libs -->
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/dropins</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/dropins</outputDirectory>
<includes>
<include>org.wso2.andes.wso2:andes-client:jar</include>
<include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/components/lib</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/lib</outputDirectory>
<includes>
<include>org.apache.activemq:activemq-client:jar</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include>
@@ -219,14 +211,14 @@
<files>
<file>
<source>src/main/bin/stratos.sh</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/bin</outputDirectory>
<destName>stratos.sh</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>src/main/bin/stratos.bat</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/bin</outputDirectory>
<destName>stratos.bat</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
@@ -235,152 +227,123 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
</file>
<file>
<source>src/main/conf/embedded-ldap.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>embedded-ldap.xml</destName>
</file>
<file>
<source>src/main/conf/axis2.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/axis2</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/axis2</outputDirectory>
<destName>axis2.xml</destName>
</file>
<file>
<source>src/main/conf/loadbalancer.conf</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>loadbalancer.conf</destName>
</file>
<file>
<source>src/main/conf/jndi.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>jndi.properties</destName>
</file>
<file>
<source>src/main/conf/mqtttopic.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>mqtttopic.properties</destName>
</file>
<file>
<source>src/main/conf/log4j.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>log4j.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/synapse.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>synapse.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/nhttp.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>nhttp.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/passthru-http.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>passthru-http.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/datasources.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>datasources.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/thrift-client-config.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
<destName>thrift-client-config.xml</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/license/LICENSE</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/notice/NOTICE</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>${project.basedir}/README.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>${project.basedir}/INSTALL.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>target/wso2carbon-core-${carbon.patch.version}/bin/README.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- <fileMode>644</fileMode>
- </file-->
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
- <!--file>
- <source>target/wso2carbon-core-${carbon.patch.version}/bin/stratos.bat
- </source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/bin/</outputDirectory>
- <filtered>true</filtered>
- </file-->
<!--Copying config files from kernel patches -->
-
<file>
<source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/dbscripts</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/dbscripts</outputDirectory>
<filtered>true</filtered>
</file>
-
- <!-- <file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2_client.xml</source>
- <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/axis2.xml</source>
- <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory>
- <filtered>true</filtered>
- </file>
- <file>
- <source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/axis2/tenant-axis2.xml</source>
- <outputDirectory>apache-stratos-autoscaler-${pom.version}/repository/conf/axis2/</outputDirectory>
- <filtered>true</filtered>
- </file>-->
<file>
<source>
../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties
</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>
../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties
</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/security/</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${pom.version}/repository/conf/</outputDirectory>
+ <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
index c814924..cdfa54a 100644
--- a/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
+++ b/products/load-balancer/modules/distribution/src/main/assembly/filter.properties
@@ -19,7 +19,6 @@
product.name=Apache Stratos Load Balancer
product.key=LB
-product.version=4.1.2
-lb.version=2.0.5
-default.server.role=LoadBalancer
-bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
\ No newline at end of file
+hotdeployment=true
+hotupdate=false
+default.server.role=LoadBalancer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml
index d257767..64867bb 100755
--- a/products/stratos/modules/distribution/pom.xml
+++ b/products/stratos/modules/distribution/pom.xml
@@ -27,7 +27,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>apache-stratos</artifactId>
+ <artifactId>stratos-distribution</artifactId>
<packaging>jar</packaging>
<name>Apache Stratos - Distribution</name>
<description>Apache Stratos Manager Distribution</description>
@@ -216,6 +216,7 @@
<goal>attached</goal>
</goals>
<configuration>
+ <finalName>${stratos.distribution.name}-${project.version}</finalName>
<filters>
<filter>${basedir}/src/assembly/filter.properties</filter>
</filters>
@@ -251,6 +252,7 @@
<goal>attached</goal>
</goals>
<configuration>
+ <finalName>${stratos.distribution.name}-${project.version}</finalName>
<filters>
<filter>${basedir}/src/assembly/filter.properties</filter>
</filters>
@@ -267,12 +269,14 @@
<goal>attached</goal>
</goals>
<configuration>
+ <finalName>${stratos.distribution.name}-${project.version}</finalName>
<filters>
<filter>${basedir}/src/assembly/filter.properties</filter>
</filters>
<descriptors>
<descriptor>${basedir}/src/assembly/bin.xml</descriptor>
</descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/distribution/src/assembly/filter.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/filter.properties b/products/stratos/modules/distribution/src/assembly/filter.properties
index 866e34e..5131124 100755
--- a/products/stratos/modules/distribution/src/assembly/filter.properties
+++ b/products/stratos/modules/distribution/src/assembly/filter.properties
@@ -19,8 +19,6 @@
product.name=Apache Stratos
product.key=STRATOS
-product.version=4.1.2
hotdeployment=true
hotupdate=false
-carbon.version=4.2.0
default.server.role=Stratos
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/distribution/src/main/conf/axis2/axis2.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/axis2/axis2.xml b/products/stratos/modules/distribution/src/main/conf/axis2/axis2.xml
index 462998f..4a4a431 100644
--- a/products/stratos/modules/distribution/src/main/conf/axis2/axis2.xml
+++ b/products/stratos/modules/distribution/src/main/conf/axis2/axis2.xml
@@ -71,12 +71,8 @@
<!--the directory in which modules are deployed inside axis2 repository-->
<parameter name="ModulesDirectory">axis2modules</parameter>
- <parameter name="userAgent" locked="true">
- @product.name@-@product.version@
- </parameter>
- <parameter name="server" locked="true">
- @product.name@-@product.version@
- </parameter>
+ <parameter name="userAgent" locked="true">${product.name}-${project.version}</parameter>
+ <parameter name="server" locked="true">${product.name}-${project.version}</parameter>
<!-- ========================================================================-->
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/distribution/src/main/conf/carbon.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/carbon.xml b/products/stratos/modules/distribution/src/main/conf/carbon.xml
index 6df16a4..cacc540 100644
--- a/products/stratos/modules/distribution/src/main/conf/carbon.xml
+++ b/products/stratos/modules/distribution/src/main/conf/carbon.xml
@@ -40,7 +40,7 @@
<!--
Product Version
-->
- <Version>${product.version}</Version>
+ <Version>${project.version}</Version>
<!--
Host name or IP address of the machine hosting this server
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/pom.xml b/products/stratos/modules/integration/pom.xml
index b3d2eab..4d8d869 100755
--- a/products/stratos/modules/integration/pom.xml
+++ b/products/stratos/modules/integration/pom.xml
@@ -111,6 +111,12 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/test/resources/test-conf</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/71481d35/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties b/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
new file mode 100644
index 0000000..5913b98
--- /dev/null
+++ b/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
@@ -0,0 +1,21 @@
+# 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.
+
+# Stratos distribution properties added via filters during the build
+distribution.file=${stratos.distribution.name}-${project.version}.zip
+distribution.version=${project.version}
+distribution.name=${stratos.distribution.name}
\ No newline at end of file
[2/2] stratos git commit: Read project version from filters in
Stratos integration test
Posted by ra...@apache.org.
Read project version from filters in Stratos integration test
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/57ecc648
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/57ecc648
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/57ecc648
Branch: refs/heads/stratos-4.1.x
Commit: 57ecc648ed6d0b96fc85d1a20aa2e048c9c4fa90
Parents: 71481d3
Author: Akila Perera <ra...@gmail.com>
Authored: Wed Aug 26 09:08:59 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Wed Aug 26 09:08:59 2015 +0530
----------------------------------------------------------------------
.../distribution/src/main/assembly/bin.xml | 84 ++++----
.../modules/distribution/src/assembly/bin.xml | 216 +++++++++----------
.../tests/StratosTestServerManager.java | 67 ++++--
.../test-conf/integration-test.properties | 9 +-
4 files changed, 206 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/57ecc648/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
index e96c930..6628f41 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
<exclude>**/*.bat</exclude>
@@ -69,7 +69,7 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude>
@@ -85,23 +85,23 @@
</fileSet>
<fileSet>
<directory>src/main/conf/synapse-configs</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/synapse-configs
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/deployment/server/synapse-configs
</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/cartridges</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/cartridges
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/deployment/server/cartridges
</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/services</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/server/services
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/deployment/server/services
</outputDirectory>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/
</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf/etc</outputDirectory>
<includes>
<include>*.xsd</include>
</includes>
@@ -110,56 +110,56 @@
<!-- Kernel Patches-->
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0001/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gentarget/WSO2-CARBON-PATCH-4.2.0-0002</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0003/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0004/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0005/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0006/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0007/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0008/*.*</include>
</includes>
@@ -169,13 +169,13 @@
<dependencySets>
<!-- use the new tool to create a bundles -->
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/lib/core/WEB-INF/lib</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/lib/core/WEB-INF/lib</outputDirectory>
<includes>
<include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/axis2/client/lib</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/axis2/client/lib</outputDirectory>
<includes>
<include>bouncycastle:bcprov-jdk15:jar</include>
</includes>
@@ -183,7 +183,7 @@
</outputFileNameMapping>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/deployment/client/modules
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/deployment/client/modules
</outputDirectory>
<includes>
<include>org.apache.rampart:rampart:mar</include>
@@ -191,14 +191,14 @@
</dependencySet>
<!-- MB Client libs -->
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/dropins</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/dropins</outputDirectory>
<includes>
<include>org.wso2.andes.wso2:andes-client:jar</include>
<include>org.apache.geronimo.specs.wso2:geronimo-jms_1.1_spec:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/components/lib</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/components/lib</outputDirectory>
<includes>
<include>org.apache.activemq:activemq-client:jar</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include>
@@ -211,14 +211,14 @@
<files>
<file>
<source>src/main/bin/stratos.sh</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/bin</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/bin</outputDirectory>
<destName>stratos.sh</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>src/main/bin/stratos.bat</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/bin</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/bin</outputDirectory>
<destName>stratos.bat</destName>
<fileMode>755</fileMode>
<filtered>true</filtered>
@@ -227,96 +227,96 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/event-broker.xml
</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
</file>
<file>
<source>src/main/conf/embedded-ldap.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>embedded-ldap.xml</destName>
</file>
<file>
<source>src/main/conf/axis2.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/axis2</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf/axis2</outputDirectory>
<destName>axis2.xml</destName>
</file>
<file>
<source>src/main/conf/loadbalancer.conf</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>loadbalancer.conf</destName>
</file>
<file>
<source>src/main/conf/jndi.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>jndi.properties</destName>
</file>
<file>
<source>src/main/conf/mqtttopic.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>mqtttopic.properties</destName>
</file>
<file>
<source>src/main/conf/log4j.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>log4j.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/synapse.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>synapse.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/nhttp.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>nhttp.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/passthru-http.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>passthru-http.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/datasources.properties</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>datasources.properties</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/thrift-client-config.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf</outputDirectory>
<destName>thrift-client-config.xml</destName>
<filtered>true</filtered>
</file>
<file>
<source>src/main/license/LICENSE</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/notice/NOTICE</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>${project.basedir}/README.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>${project.basedir}/INSTALL.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/bin/</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -324,26 +324,26 @@
<!--Copying config files from kernel patches -->
<file>
<source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts/mysql.sql</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/dbscripts</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/dbscripts</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>
../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-text.properties
</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/security/</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>
../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002/repository/conf/security/cipher-tool.properties
</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/security/</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004/repository/conf/carbon.xml</source>
- <outputDirectory>apache-stratos-load-balancer-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${load.balancer.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/stratos/blob/57ecc648/products/stratos/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/assembly/bin.xml b/products/stratos/modules/distribution/src/assembly/bin.xml
index 06ec14a..8f8b4f3 100755
--- a/products/stratos/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos/modules/distribution/src/assembly/bin.xml
@@ -26,7 +26,7 @@
<fileSets>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
- <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
<exclude>**/wso2server.bat</exclude>
@@ -62,7 +62,7 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components
</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components</outputDirectory>
<excludes>
<exclude>**/eclipse.ini</exclude>
<exclude>**/*.lock</exclude>
@@ -84,7 +84,7 @@
<!-- Exclude non-Apache2 compliant dependency from lib/endorsed/ directory-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/endorsed</directory>
- <outputDirectory>${project.artifactId}-${project.version}/lib/endorsed</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib/endorsed</outputDirectory>
<excludes>
<exclude>**/jboss-transaction-api_1.1_spec-1.0.0.Final.jar</exclude>
</excludes>
@@ -93,7 +93,7 @@
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/jaggeryapps
</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/jaggeryapps</outputDirectory>
<excludes>
<exclude>**/publisher/**</exclude>
<exclude>**/store/**</exclude>
@@ -105,7 +105,7 @@
</fileSet>
<fileSet>
<directory>target/shopping-cart-global-${shoppingcart.global.version}</directory>
- <outputDirectory>${project.artifactId}-${project.version}/samples/bin</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/samples/bin</outputDirectory>
<includes>
<include>**/*.car</include>
<include>**/*.properties</include>
@@ -113,7 +113,7 @@
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/console</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/console
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/jaggeryapps/console
</outputDirectory>
<excludes>
<exclude>**/README</exclude>
@@ -121,16 +121,16 @@
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/sso</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/jaggeryapps/sso
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/jaggeryapps/sso
</outputDirectory>
</fileSet>
<fileSet>
<directory>../../../../components/org.apache.stratos.manager.console/modules/console</directory>
- <outputDirectory>${project.artifactId}-${project.version}/modules/console</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/modules/console</outputDirectory>
</fileSet>
<fileSet>
<directory>target/wso2carbon-core-${carbon.kernel.version}</directory>
- <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}</outputDirectory>
<excludes>
<exclude>**/daemon.sh</exclude>
<exclude>**/log4j.properties</exclude>
@@ -148,7 +148,7 @@
<!-- Copying themes, cloud icons-->
<fileSet>
<directory>src/main/resources</directory>
- <outputDirectory>${project.artifactId}-${project.version}/resources</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/resources</outputDirectory>
<fileMode>755</fileMode>
<includes>
<include>allthemes/**</include>
@@ -159,7 +159,7 @@
<!-- ADC management related files -->
<fileSet>
<directory>src/main/conf/</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<includes>
<include>cartridge-config.properties</include>
<include>policies.xml</include>
@@ -167,7 +167,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/etc</outputDirectory>
<includes>
<include>policies.xsd</include>
</includes>
@@ -175,14 +175,14 @@
<fileSet>
<directory>../p2-profile/target/wso2carbon-core-${carbon.platform.version}/repository/conf/etc/</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/etc</outputDirectory>
<includes>
<include>**/cassandra.yaml</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<includes>
<include>**/rule-engine-config.xml</include>
</includes>
@@ -190,7 +190,7 @@
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/multitenancy/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/multitenancy/</outputDirectory>
<includes>
<include>**/multitenancy-packages.xml</include>
<include>**/stratos.xml</include>
@@ -199,7 +199,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/dbscripts</outputDirectory>
<excludes>
<exclude>**/identity/**</exclude>
<!-- Patched in WSO2-CARBON-PATCH-4.2.0-0001, WSO2-CARBON-PATCH-4.2.0-0012 and WSO2-CARBON-PATCH-4.2.0-0003
@@ -215,7 +215,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity</directory>
- <outputDirectory>${project.artifactId}-${project.version}/dbscripts/identity</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/dbscripts/identity</outputDirectory>
<includes>
<include>**/**.sql</include>
</includes>
@@ -224,7 +224,7 @@
<!-- copy cxf runtime -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/lib/runtimes</directory>
- <outputDirectory>${project.artifactId}-${project.version}/lib/runtimes/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib/runtimes/</outputDirectory>
<includes>
<include>*/**</include>
</includes>
@@ -232,7 +232,7 @@
<!-- copy jaggery modules -->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/modules</directory>
- <outputDirectory>${project.artifactId}-${project.version}/modules</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/modules</outputDirectory>
<excludes>
<exclude>**/carbon/**</exclude>
</excludes>
@@ -242,40 +242,40 @@
</fileSet>
<fileSet>
<directory>src/main/conf/multitenancy</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/multitenancy</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/multitenancy</outputDirectory>
</fileSet>
<!-- copy the billing h2 db -->
<fileSet>
<directory>target/database</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/database</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/database</outputDirectory>
</fileSet>
<!-- Apply Kernel Patches-->
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0001/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0002</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0002/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0003/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0004</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
</excludes>
@@ -285,21 +285,21 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0005</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0005/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0006</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0006/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0007</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
</excludes>
@@ -309,14 +309,14 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0008</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<includes>
<include>**/patch0008/*.*</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0009</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
</excludes>
@@ -326,7 +326,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0010</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
</excludes>
@@ -336,7 +336,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0011</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui-4.2.0.jar</exclude>
</excludes>
@@ -346,7 +346,7 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/patches</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/patches</outputDirectory>
<excludes>
<exclude>**/org.wso2.carbon.ui_4.2.0.jar</exclude>
</excludes>
@@ -358,7 +358,7 @@
<!-- Additional configuration for kernel patches -->
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0001/dbscripts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/dbscripts</outputDirectory>
<includes>
<include>**/db2.sql</include>
<include>**/mysql.sql</include>
@@ -366,35 +366,35 @@
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0003/dbscripts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/dbscripts</outputDirectory>
<includes>
<include>**/mysql_cluster.sql</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0009/bin</directory>
- <outputDirectory>${project.artifactId}-${project.version}/bin</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/bin</outputDirectory>
<includes>
<include>**/org.wso2.carbon.bootstrap_4.2.0.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0010/lib</directory>
- <outputDirectory>${project.artifactId}-${project.version}/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib</outputDirectory>
<includes>
<include>**/org.wso2.ciphertool-1.0.0-wso2v2.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012/lib</directory>
- <outputDirectory>${project.artifactId}-${project.version}/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib</outputDirectory>
<includes>
<include>**/org.wso2.carbon.server-4.2.0.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>../p2-profile-gen/target/WSO2-CARBON-PATCH-4.2.0-0012/dbscripts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/dbscripts</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/dbscripts</outputDirectory>
<includes>
<include>**/oracle_rac.sql</include>
</includes>
@@ -403,22 +403,22 @@
<!-- Jaggery modules -->
<fileSet>
<directory>src/main/temp-artifacts/sso</directory>
- <outputDirectory>${project.artifactId}-${project.version}/modules/sso</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/modules/sso</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/temp-artifacts/carbon</directory>
- <outputDirectory>${project.artifactId}-${project.version}/modules/carbon</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/modules/carbon</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/temp-artifacts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.wso2.store.sso.common_1.0.0.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>src/main/temp-artifacts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.wso2.stratos.identity.saml2.sso.mgt_2.2.0.jar</include>
</includes>
@@ -426,7 +426,7 @@
<!-- autoscaler -->
<fileSet>
<directory>src/main/temp-artifacts</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/plugins</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/plugins</outputDirectory>
<includes>
<include>org.jaggeryjs.hostobjects.xhr_0.9.0.ALPHA4_wso2v1.jar</include>
</includes>
@@ -436,70 +436,70 @@
<!--creating an empty input event adaptors directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/inputeventadaptors</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/inputeventadaptors
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/inputeventadaptors
</outputDirectory>
</fileSet>
<!--creating an empty output event adaptors directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/outputeventadaptors</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/outputeventadaptors
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/outputeventadaptors
</outputDirectory>
</fileSet>
<!--creating an empty event builders directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/eventbuilders</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/eventbuilders
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/eventbuilders
</outputDirectory>
</fileSet>
<!--creating an empty event formatters directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/eventformatters</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/eventformatters
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/eventformatters
</outputDirectory>
</fileSet>
<!--creating an empty execution plans directory-->
<fileSet>
<directory>../../../../extensions/cep/artifacts/executionplans</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/executionplans
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/executionplans
</outputDirectory>
</fileSet>
<!--customization scripts-->
<fileSet>
<directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/scripts
</directory>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/scripts</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/scripts</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/lib</outputDirectory>
<includes>
<include>bouncycastle:bcprov-jdk15:jar</include>
</includes>
</dependencySet>
<!-- use the new tool to create a bundles -->
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/lib/core/WEB-INF/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib/core/WEB-INF/lib</outputDirectory>
<includes>
<include>org.wso2.carbon:org.wso2.carbon.mediator.bridge:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/axis2/client/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/axis2/client/lib</outputDirectory>
<includes>
<include>bouncycastle:bcprov-jdk15:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/client/modules</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/client/modules</outputDirectory>
<includes>
<include>org.apache.rampart:rampart:mar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/lib</outputDirectory>
<includes>
<include>org.apache.activemq:activemq-client:jar</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar</include>
@@ -508,19 +508,19 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/lib</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/lib</outputDirectory>
<includes>
<include>org.apache.stratos:org.apache.stratos.cep.extension:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/lib/endorsed</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/lib/endorsed</outputDirectory>
<includes>
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>${project.artifactId}-${project.version}/repository/components/dropins</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/components/dropins</outputDirectory>
<includes>
<include>org.apache.stratos:org.wso2.carbon.ui:jar</include>
</includes>
@@ -530,81 +530,81 @@
<files>
<file>
<source>src/main/conf/carbon.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/security/authenticators.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/security/cipher-text.properties</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/security/cipher-tool.properties</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/security</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>src/main/conf/log4j.properties</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/jndi.properties</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/tenant-mgt.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/registry.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/user-mgt.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/mqtttopic.properties</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/event-broker.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/sso-idp-config.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<!-- cep -->
<file>
<source>src/main/conf/siddhi/siddhi.extension</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/siddhi/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/siddhi/</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<source>../../../../extensions/cep/artifacts/streamdefinitions/stream-manager-config.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
</file>
<!-- cloud-controller -->
@@ -612,111 +612,111 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cloud-controller.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
</file>
<!-- cloud-controller -->
<!-- autoscaler -->
<file>
<source>src/main/conf/autoscaler.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/mock-iaas.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<!-- identity.xml and application-authentication.xml for oAuth feature -->
<file>
<source>src/main/conf/identity.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/security/application-authentication.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/security/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/security/</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/application-authenticators.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/security/client-truststore.jks</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/resources/security/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/resources/security/</outputDirectory>
<filtered>false</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/axis2/axis2.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/axis2/axis2_client.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/axis2/tenant-axis2.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/axis2/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/axis2/</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/mincheck.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/maxcheck.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/obsoletecheck.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/scaling.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/dependent-scaling.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<file>
<source>src/main/conf/drools/terminateall.drl</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/drools</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/drools</outputDirectory>
<filtered>true</filtered>
<fileMode>600</fileMode>
</file>
<!-- autoscaler -->
<file>
<source>${project.basedir}/INSTALL.txt</source>
- <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/conf/etc/launch.ini</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/etc</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -737,7 +737,7 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -745,7 +745,7 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -753,25 +753,25 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/tomcat</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/tomcat</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>${project.basedir}/README.txt</source>
- <outputDirectory>${project.artifactId}-${project.version}</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/README.txt</source>
- <outputDirectory>${project.artifactId}-${project.version}/bin/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>target/wso2carbon-core-${carbon.kernel.version}/bin/version.txt</source>
- <outputDirectory>${project.artifactId}-${project.version}/bin/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -779,7 +779,7 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/security/userRP.jks
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/resources/security/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/resources/security/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- Including logging-config.xml file -->
@@ -787,7 +787,7 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/etc/</outputDirectory>
</file>
<file>
<source>src/bin/stratos.sh</source>
@@ -804,7 +804,7 @@
<file>
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/claim-config.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -812,14 +812,14 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/tasks-config.xml
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/etc</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/etc</outputDirectory>
</file>
<!-- REST endpoint webapp -->
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/api.war
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- Mock iaas webapp -->
@@ -827,7 +827,7 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/mock-iaas.war
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!--oauth2.war and authenticationendpoint.war is related to oAuth feature -->
@@ -835,14 +835,14 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/oauth2.war
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- End of REST endpoint webapp -->
@@ -851,23 +851,23 @@
<source>
../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/metadata.war
</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/deployment/server/webapps/</outputDirectory>
<fileMode>644</fileMode>
</file>
<!-- End of Meta data service webapp -->
<file>
<source>src/main/conf/data-bridge/data-bridge-config.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/data-bridge/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/data-bridge/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/conf/data-bridge/thrift-agent-config.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/data-bridge/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/data-bridge/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/conf/thrift-client-config.xml</source>
- <outputDirectory>${project.artifactId}-${project.version}/repository/conf/</outputDirectory>
+ <outputDirectory>${stratos.distribution.name}-${project.version}/repository/conf/</outputDirectory>
<fileMode>644</fileMode>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/stratos/blob/57ecc648/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
index 99596dd..ea3d8f9 100755
--- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
+++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/StratosTestServerManager.java
@@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.stratos.common.test.TestLogAppender;
-import org.apache.stratos.integration.tests.application.SampleApplicationsTest;
import org.apache.stratos.integration.tests.rest.IntegrationMockClient;
import org.apache.stratos.integration.tests.rest.RestClient;
import org.testng.annotations.AfterSuite;
@@ -39,6 +38,7 @@ import org.wso2.carbon.integration.framework.utils.TestUtil;
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.util.Properties;
import static org.testng.Assert.assertNotNull;
@@ -46,20 +46,27 @@ import static org.testng.Assert.assertNotNull;
* Prepare activemq, Stratos server for tests, enables mock iaas, starts servers and stop them after the tests.
*/
public class StratosTestServerManager extends TestServerManager {
-
private static final Log log = LogFactory.getLog(StratosTestServerManager.class);
-
- private final static String CARBON_ZIP = SampleApplicationsTest.class.getResource("/").getPath() +
- "/../../../distribution/target/apache-stratos-4.1.2.zip";
- private final static int PORT_OFFSET = 0;
- private static final String ACTIVEMQ_BIND_ADDRESS = "tcp://localhost:61617";
- private static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
- private static final String SCALING_DROOL_FILE = "scaling.drl";
- private static final String JNDI_PROPERTIES_FILE = "jndi.properties";
- private static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
+ private static Properties integrationProperties;
+ public static final String BASE_PATH = StratosTestServerManager.class.getResource("/").getPath();
+ public static final String STRATOS_DISTRIBUTION_NAME = "distribution.path";
+ public final static String PORT_OFFSET = "carbon.port.offset";
+ public static final String ACTIVEMQ_BIND_ADDRESS = "activemq.bind.address";
+ public static final String STRATOS_ENDPOINT = "stratos.endpoint";
+ public static final String ADMIN_USERNAME = "stratos.admin.username";
+ public static final String ADMIN_PASSWORD = "stratos.admin.password";
+ public static final String MOCK_IAAS_XML_FILE = "mock-iaas.xml";
+ public static final String SCALING_DROOL_FILE = "scaling.drl";
+ public static final String JNDI_PROPERTIES_FILE = "jndi.properties";
+ public static final String JMS_OUTPUT_ADAPTER_FILE = "JMSOutputAdaptor.xml";
+
+ protected String distributionName;
+ protected int portOffset;
+ protected String adminUsername;
+ protected String adminPassword;
+ protected String stratosEndpoint;
+ protected String activemqBindAddress;
protected RestClient restClient;
- private String endpoint = "http://localhost:9763";
-
private BrokerService broker = new BrokerService();
private TestLogAppender testLogAppender = new TestLogAppender();
private ServerUtils serverUtils;
@@ -67,10 +74,34 @@ public class StratosTestServerManager extends TestServerManager {
protected IntegrationMockClient mockIaasApiClient;
public StratosTestServerManager() {
- super(CARBON_ZIP, PORT_OFFSET);
+ super(BASE_PATH + getIntegrationTestProperty(STRATOS_DISTRIBUTION_NAME),
+ Integer.parseInt(getIntegrationTestProperty(PORT_OFFSET)));
+
+ distributionName = integrationProperties.getProperty(STRATOS_DISTRIBUTION_NAME);
+ portOffset = Integer.parseInt(integrationProperties.getProperty(PORT_OFFSET));
+ adminUsername = integrationProperties.getProperty(ADMIN_USERNAME);
+ adminPassword = integrationProperties.getProperty(ADMIN_PASSWORD);
+ stratosEndpoint = integrationProperties.getProperty(STRATOS_ENDPOINT);
+ activemqBindAddress = integrationProperties.getProperty(ACTIVEMQ_BIND_ADDRESS);
serverUtils = new ServerUtils();
- restClient = new RestClient(endpoint, "admin", "admin");
- mockIaasApiClient = new IntegrationMockClient(endpoint + "/mock-iaas/api");
+ restClient = new RestClient(stratosEndpoint, adminUsername, adminPassword);
+ mockIaasApiClient = new IntegrationMockClient(stratosEndpoint + "/mock-iaas/api");
+ }
+
+ private static String getIntegrationTestProperty(String key) {
+ if (integrationProperties == null) {
+ integrationProperties = new Properties();
+ try {
+ integrationProperties
+ .load(StratosTestServerManager.class.getResourceAsStream("/integration-test.properties"));
+ log.info("Stratos integration properties: " + integrationProperties.toString());
+ }
+ catch (IOException e) {
+ log.error("Error loading integration-test.properties file from classpath. Please make sure that file " +
+ "exists in classpath.", e);
+ }
+ }
+ return integrationProperties.getProperty(key);
}
@Override
@@ -86,7 +117,7 @@ public class StratosTestServerManager extends TestServerManager {
broker.setDataDirectory(StratosTestServerManager.class.getResource("/").getPath() +
File.separator + ".." + File.separator + "activemq-data");
broker.setBrokerName("testBroker");
- broker.addConnector(ACTIVEMQ_BIND_ADDRESS);
+ broker.addConnector(activemqBindAddress);
broker.start();
long time2 = System.currentTimeMillis();
log.info(String.format("ActiveMQ started in %d sec", (time2 - time1) / 1000));
@@ -112,7 +143,7 @@ public class StratosTestServerManager extends TestServerManager {
log.info("Stratos server setup completed");
log.info("Starting Stratos server...");
- this.serverUtils.startServerUsingCarbonHome(carbonHome, carbonHome, "stratos", PORT_OFFSET, null);
+ this.serverUtils.startServerUsingCarbonHome(carbonHome, carbonHome, "stratos", portOffset, null);
FrameworkSettings.init();
while (!serverStarted()) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/57ecc648/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties b/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
index 5913b98..a26383c 100644
--- a/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
+++ b/products/stratos/modules/integration/src/test/resources/test-conf/integration-test.properties
@@ -16,6 +16,11 @@
# under the License.
# Stratos distribution properties added via filters during the build
-distribution.file=${stratos.distribution.name}-${project.version}.zip
+distribution.path=/../../../distribution/target/${stratos.distribution.name}-${project.version}.zip
distribution.version=${project.version}
-distribution.name=${stratos.distribution.name}
\ No newline at end of file
+distribution.name=${stratos.distribution.name}
+carbon.port.offset=0
+activemq.bind.address=tcp://localhost:61617
+stratos.endpoint=http://localhost:9763
+stratos.admin.username=admin
+stratos.admin.password=admin
\ No newline at end of file