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 <[email protected]> Authored: Wed Aug 26 00:16:54 2015 +0530 Committer: Akila Perera <[email protected]> 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@[email protected]@ - </parameter> - <parameter name="server" locked="true"> - @product.name@[email protected]@ - </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
