You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/01/07 09:03:13 UTC
git commit: upgrading axis2 version to 1.6.1wso2v10 and correcting
some issues in SM product build
Updated Branches:
refs/heads/master 249e1290e -> ee1d29c3f
upgrading axis2 version to 1.6.1wso2v10 and correcting some issues in SM product build
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ee1d29c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ee1d29c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ee1d29c3
Branch: refs/heads/master
Commit: ee1d29c3f30209f00b8d2768d7df623e3f0fb84f
Parents: 249e129
Author: Ubuntu <ub...@ip-10-146-8-101.ap-southeast-1.compute.internal>
Authored: Tue Jan 7 08:02:59 2014 +0000
Committer: Ubuntu <ub...@ip-10-146-8-101.ap-southeast-1.compute.internal>
Committed: Tue Jan 7 08:02:59 2014 +0000
----------------------------------------------------------------------
components/pom.xml | 4 ++--
features/pom.xml | 2 +-
pom.xml | 2 +-
.../modules/distribution/src/assembly/bin.xml | 20 ++++++++++----------
.../modules/features/service/pom.xml | 2 +-
.../stratos-manager/modules/integration/pom.xml | 4 ++--
products/stratos-manager/pom.xml | 2 +-
service-stubs/pom.xml | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 0868753..40f2595 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -263,8 +263,8 @@
<version.equinox.osgi>3.8.1.v20120830-144521</version.equinox.osgi>
<axiom.osgi.version.range>[1.2.11.wso2v4, 1.3.0)</axiom.osgi.version.range>
<version.tomcat>7.0.34</version.tomcat>
- <axis2.wso2.version>1.6.1.wso2v9</axis2.wso2.version>
- <axis2.kernel.version>1.6.1-wso2v9</axis2.kernel.version>
+ <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
+ <axis2.kernel.version>1.6.1-wso2v10</axis2.kernel.version>
<version.log4j>1.2.17</version.log4j>
<version.commons.logging>1.1.1</version.commons.logging>
<orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 88d599d..b3945f8 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -70,7 +70,7 @@
<sun.jersey.version>1.12</sun.jersey.version>
<gson2.version>2.2</gson2.version>
<google.collect.osgi.version>1.0.0.wso2v2</google.collect.osgi.version>
- <axis2.wso2.version>1.6.1.wso2v9</axis2.wso2.version>
+ <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
<axiom.wso2.version>1.2.11.wso2v4</axiom.wso2.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 26b5f5c..c8179ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -431,7 +431,7 @@
<wso2carbon.version>4.2.0</wso2carbon.version>
<carbon.platform.package.import.version.range>[4.2.0, 5.0.0)</carbon.platform.package.import.version.range>
<carbon.platform.package.export.version>4.2.0</carbon.platform.package.export.version>
- <axis2.osgi.version>1.6.1.wso2v9</axis2.osgi.version>
+ <axis2.osgi.version>1.6.1.wso2v10</axis2.osgi.version>
<jclouds.version>1.6.2-incubating</jclouds.version>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/products/stratos-manager/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/distribution/src/assembly/bin.xml b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
index 60aff65..75ae826 100755
--- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
@@ -424,13 +424,13 @@
</file>
<file>
<source>src/main/notice/NOTICE</source>
- <outputDirectory>apache-stratos-sc-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
<file>
<source>src/main/license/LICENSE</source>
- <outputDirectory>apache-stratos-sc-${pom.version}</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}</outputDirectory>
<filtered>true</filtered>
<fileMode>644</fileMode>
</file>
@@ -543,49 +543,49 @@
</file>
<file>
<source>src/bin/stratos.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/stratos.bat</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/git-folder-structure.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/manage-git-repo.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/set-mysql-password.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/add_entry_zone_file.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/remove_entry_zone_file.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
<file>
<source>src/bin/update-instance.sh</source>
- <outputDirectory>apache-stratos-sc-${pom.version}/bin/</outputDirectory>
+ <outputDirectory>apache-stratos-manager-${pom.version}/bin/</outputDirectory>
<filtered>true</filtered>
<fileMode>755</fileMode>
</file>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/products/stratos-manager/modules/features/service/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/features/service/pom.xml b/products/stratos-manager/modules/features/service/pom.xml
index bebbb84..1cd80fc 100755
--- a/products/stratos-manager/modules/features/service/pom.xml
+++ b/products/stratos-manager/modules/features/service/pom.xml
@@ -43,7 +43,7 @@
<wso2carbon.version>4.2.0</wso2carbon.version>
<synapse.version>${version.synapse}</synapse.version>
<quartz.wso2.version>2.1.1.wso2v1</quartz.wso2.version>
- <stratos.controller.version>1.0.0</stratos.controller.version>
+ <stratos.manager.version>${project.version}</stratos.manager.version>
</properties>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/products/stratos-manager/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/integration/pom.xml b/products/stratos-manager/modules/integration/pom.xml
index a21324f..b7e6cc4 100755
--- a/products/stratos-manager/modules/integration/pom.xml
+++ b/products/stratos-manager/modules/integration/pom.xml
@@ -62,10 +62,10 @@
<systemProperties>
<maven.test.haltafterfailure>false</maven.test.haltafterfailure>
<carbon.zip>
- ${basedir}/../distribution/target/apache-stratos-sc-${project.version}.zip
+ ${basedir}/../distribution/target/apache-stratos-manager-${project.version}.zip
</carbon.zip>
<sec.verifier.dir>${basedir}/target/security-verifier/</sec.verifier.dir>
- <extracted.dir>stratos-controller-parent-${project.version}</extracted.dir>
+ <extracted.dir>stratos-manager-parent-${project.version}</extracted.dir>
<emma.home>${basedir}/target/emma</emma.home>
</systemProperties>
<workingDirectory>${basedir}/target</workingDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/products/stratos-manager/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/pom.xml b/products/stratos-manager/pom.xml
index 087ddf5..95df09c 100755
--- a/products/stratos-manager/pom.xml
+++ b/products/stratos-manager/pom.xml
@@ -310,7 +310,7 @@
<features-dashboard.war.version>1.0.0</features-dashboard.war.version>
<carbon.version>4.2.0</carbon.version>
<synapse.version>2.1.2.wso2v3</synapse.version>
- <stratos.controller.version>1.0.1</stratos.controller.version>
+ <stratos.manager.version>${project.version}</stratos.manager.version>
<stratos.component.version>2.1.0</stratos.component.version>
<project.version>4.0.0-SNAPSHOT</project.version>
<stratos.component.patch.version>2.1.3</stratos.component.patch.version>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ee1d29c3/service-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/pom.xml b/service-stubs/pom.xml
index 247b698..5125b21 100644
--- a/service-stubs/pom.xml
+++ b/service-stubs/pom.xml
@@ -118,7 +118,7 @@
</dependencyManagement>
<properties>
- <axis2.wso2.version>1.6.1.wso2v9</axis2.wso2.version>
+ <axis2.wso2.version>1.6.1.wso2v10</axis2.wso2.version>
<axis2.wso2.client.version>${axis2.wso2.version}</axis2.wso2.client.version>
<wsdl4j.wso2.version>1.6.2.wso2v4</wsdl4j.wso2.version>
<version.commons.logging>1.1.1</version.commons.logging>