You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/08/02 07:27:26 UTC
git commit: Fixing elb product refactoring issues
Updated Branches:
refs/heads/master 77fe1c2df -> a4c7e1ae9
Fixing elb product refactoring issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a4c7e1ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a4c7e1ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a4c7e1ae
Branch: refs/heads/master
Commit: a4c7e1ae926dad3343f2df800e86c451783def3a
Parents: 77fe1c2
Author: Lahiru Sandaruwan <la...@wso2.com>
Authored: Fri Aug 2 11:02:35 2013 +0530
Committer: Lahiru Sandaruwan <la...@wso2.com>
Committed: Fri Aug 2 11:02:35 2013 +0530
----------------------------------------------------------------------
.../org.apache.stratos.lb.endpoint/pom.xml | 2 +-
.../pom.xml | 3 +--
products/elb/LICENSE.txt | 8 +++----
.../distribution/src/main/conf/axis2.xml | 2 +-
products/elb/modules/p2-profile/pom.xml | 24 ++++++++++----------
products/elb/pom.xml | 1 +
6 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/components/org.apache.stratos.lb.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.endpoint/pom.xml b/components/org.apache.stratos.lb.endpoint/pom.xml
index 66f6bb7..2a55cb8 100644
--- a/components/org.apache.stratos.lb.endpoint/pom.xml
+++ b/components/org.apache.stratos.lb.endpoint/pom.xml
@@ -102,7 +102,7 @@
!org.apache.stratos.lb.endpoint.endpoint,
!org.apache.stratos.lb.endpoint,
org.apache.stratos.lb.common.*; version=${project.version},
- org.apache.stratos.registry.core.service; version=1.0.1,
+ org.wso2.carbon.registry.core.service; version=1.0.1,
*;resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
index 8ff12df..9c688de 100644
--- a/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
+++ b/features/load-balancer/org.apache.stratos.lb.endpoint.server.feature/pom.xml
@@ -75,7 +75,7 @@
<bundleDef>org.apache.stratos:org.apache.stratos.lb.endpoint:${project.version}</bundleDef>
</bundles>
<importFeatures>
- <importFeatureDef>org.wso2.carbon.core.server:${carbon.patch.version}</importFeatureDef>
+ <importFeatureDef>org.wso2.carbon.core.server:${wso2carbon.version}</importFeatureDef>
<importFeatureDef>org.apache.synapse.wso2:${synapse.wso2.version}</importFeatureDef>
<importFeatureDef>org.apache.stratos.lb.common:${project.version}</importFeatureDef>
</importFeatures>
@@ -86,7 +86,6 @@
</plugins>
</build>
<properties>
- <carbon.version>4.1.0</carbon.version>
<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/products/elb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/products/elb/LICENSE.txt b/products/elb/LICENSE.txt
index 28a67cc..5d2cfc3 100644
--- a/products/elb/LICENSE.txt
+++ b/products/elb/LICENSE.txt
@@ -192,7 +192,7 @@ org.wso2.carbon.base_4.1.0.jar
org.wso2.carbon.bootstrap-4.1.0.jar bundle apache2
org.wso2.carbon.caching.core_4.1.0.jar bundle apache2
org.wso2.carbon.caching_4.1.0.jar bundle apache2
-org.wso2.carbon.cartridge.messages_2.1.1.jar bundle apache2
+org.apache.stratos.cartridge.messages_2.1.1.jar bundle apache2
org.wso2.carbon.cluster.mgt.core_4.1.0.jar bundle apache2
org.wso2.carbon.coordination.common_4.1.0.jar bundle apache2
org.wso2.carbon.coordination.core_4.1.0.jar bundle apache2
@@ -220,9 +220,9 @@ org.wso2.carbon.feature.mgt.stub_4.1.0.jar
org.wso2.carbon.framework.exporter_4.1.0.jar bundle apache2
org.wso2.carbon.i18n_4.1.0.jar bundle apache2
org.wso2.carbon.jasper.patch_4.1.0.jar bundle apache2
-org.wso2.carbon.lb.common_4.1.3.jar bundle apache2
-org.wso2.carbon.lb.endpoint_4.1.3.jar bundle apache2
-org.wso2.carbon.load.balance.cartridge.autoscaler.service.stub_4.1.3.jar bundle apache2
+org.apache.stratos.lb.common_4.1.3.jar bundle apache2
+org.apache.stratos.lb.endpoint_4.1.3.jar bundle apache2
+org.apache.stratos.load.balance.cartridge.autoscaler.service.stub_4.1.3.jar bundle apache2
org.wso2.carbon.logging-4.1.0.jar bundle apache2
org.wso2.carbon.logging_4.1.0.jar bundle apache2
org.wso2.carbon.mediation.dependency.mgt_4.1.1.jar bundle apache2
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/products/elb/modules/distribution/src/main/conf/axis2.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/distribution/src/main/conf/axis2.xml b/products/elb/modules/distribution/src/main/conf/axis2.xml
index dcfd2ed..130a662 100755
--- a/products/elb/modules/distribution/src/main/conf/axis2.xml
+++ b/products/elb/modules/distribution/src/main/conf/axis2.xml
@@ -373,7 +373,7 @@
The clustering domain/group. Nodes in the same group will belong to the same multicast
domain. There will not be interference between nodes in different groups.
-->
- <parameter name="domain">wso2.carbon.lb.domain</parameter>
+ <parameter name="domain">lb.domain</parameter>
<!--
When a Web service request is received, and processed, before the response is sent to the
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/products/elb/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/modules/p2-profile/pom.xml b/products/elb/modules/p2-profile/pom.xml
index 6d9b247..8021429 100755
--- a/products/elb/modules/p2-profile/pom.xml
+++ b/products/elb/modules/p2-profile/pom.xml
@@ -143,7 +143,7 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.lb.endpoint.server.feature:${carbon.patch.version.4.1.3}
+ org.apache.stratos:org.apache.stratos.lb.endpoint.server.feature:${stratos.version}
</featureArtifactDef>
<featureArtifactDef>
@@ -167,13 +167,13 @@
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.stratos.cloud.controller.feature:${stratos.component.patch.version.2.1.3}
+ org.apache.stratos:org.apache.stratos.cloud.controller.feature:${stratos.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.mediator.autoscale.feature:${carbon.patch.version.4.1.3}
+ org.apache.stratos:org.apache.stratos.mediator.autoscale.feature:${stratos.version}
</featureArtifactDef>
<featureArtifactDef>
- org.wso2.carbon:org.wso2.carbon.lb.common.feature:${carbon.patch.version.4.1.3}
+ org.apache.stratos:org.apache.stratos.lb.common.feature:${stratos.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon:org.wso2.carbon.coordination.server.feature:${carbon.version}
@@ -258,8 +258,8 @@
<version>${carbon.patch.version.4.1.1}</version>
</feature>
<feature>
- <id>org.wso2.carbon.stratos.cloud.controller.feature.group</id>
- <version>${stratos.component.patch.version.2.1.3}</version>
+ <id>org.apache.stratos.cloud.controller.feature.group</id>
+ <version>${stratos.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.endpoint.server.feature.group</id>
@@ -302,16 +302,16 @@
<version>${carbon.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.mediator.autoscale.feature.group</id>
- <version>${carbon.patch.version.4.1.3}</version>
+ <id>org.apache.stratos.mediator.autoscale.feature.group</id>
+ <version>${stratos.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.lb.common.feature.group</id>
- <version>${carbon.patch.version.4.1.3}</version>
+ <id>org.apache.stratos.lb.common.feature.group</id>
+ <version>${stratos.version}</version>
</feature>
<feature>
- <id>org.wso2.carbon.lb.endpoint.server.feature.group</id>
- <version>${carbon.patch.version.4.1.3}</version>
+ <id>org.apache.stratos.lb.endpoint.server.feature.group</id>
+ <version>${stratos.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a4c7e1ae/products/elb/pom.xml
----------------------------------------------------------------------
diff --git a/products/elb/pom.xml b/products/elb/pom.xml
index 77e5046..5abb7e2 100755
--- a/products/elb/pom.xml
+++ b/products/elb/pom.xml
@@ -201,6 +201,7 @@
<carbon.kernel.version>4.1.0</carbon.kernel.version>
<carbon.patch.version.4.1.1>4.1.1</carbon.patch.version.4.1.1>
<carbon.patch.version.4.1.3>4.1.3</carbon.patch.version.4.1.3>
+ <stratos.version>3.0.0-SNAPSHOT</stratos.version>
<carbon.p2.plugin.version>1.5.2</carbon.p2.plugin.version>
<stratos.component.version>2.1.0</stratos.component.version>
<stratos.component.patch.version.2.1.1>2.1.1</stratos.component.patch.version.2.1.1>