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 2013/07/04 07:57:52 UTC
[1/2] git commit: correcting scr references in
AutoscalerTaskServiceComponent.java
Updated Branches:
refs/heads/master 9b163dd44 -> fef1a6a28
correcting scr references in AutoscalerTaskServiceComponent.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/34c47617
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34c47617
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34c47617
Branch: refs/heads/master
Commit: 34c47617f48ade2df1cfc27989702136fe258026
Parents: 17c7c53
Author: Isuru <is...@wso2.com>
Authored: Thu Jul 4 11:27:05 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Jul 4 11:27:05 2013 +0530
----------------------------------------------------------------------
.../internal/AutoscalerTaskServiceComponent.java | 4 ++--
.../org.apache.stratos.lb.endpoint/4.1.3/pom.xml | 16 +++++++---------
components/load-balancer/pom.xml | 1 +
features/pom.xml | 12 ++++++------
4 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34c47617/components/load-balancer/autoscaler/org.apache.stratos.mediator.autoscale/4.1.3/src/main/java/org/apache/stratos/mediator/autoscale/lbautoscale/internal/AutoscalerTaskServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/load-balancer/autoscaler/org.apache.stratos.mediator.autoscale/4.1.3/src/main/java/org/apache/stratos/mediator/autoscale/lbautoscale/internal/AutoscalerTaskServiceComponent.java b/components/load-balancer/autoscaler/org.apache.stratos.mediator.autoscale/4.1.3/src/main/java/org/apache/stratos/mediator/autoscale/lbautoscale/internal/AutoscalerTaskServiceComponent.java
index ee60de5..06a8f5e 100644
--- a/components/load-balancer/autoscaler/org.apache.stratos.mediator.autoscale/4.1.3/src/main/java/org/apache/stratos/mediator/autoscale/lbautoscale/internal/AutoscalerTaskServiceComponent.java
+++ b/components/load-balancer/autoscaler/org.apache.stratos.mediator.autoscale/4.1.3/src/main/java/org/apache/stratos/mediator/autoscale/lbautoscale/internal/AutoscalerTaskServiceComponent.java
@@ -65,8 +65,8 @@ import java.util.Map;
* interface="org.wso2.carbon.user.core.service.RealmService"
* cardinality="1..1" policy="dynamic" bind="setRealmService"
* unbind="unsetRealmService"
- * @scr.reference name="org.wso2.carbon.lb.common"
- * interface="org.wso2.carbon.lb.common.service.LoadBalancerConfigurationService"
+ * @scr.reference name="org.apache.stratos.lb.common"
+ * interface="org.apache.stratos.lb.common.service.LoadBalancerConfigurationService"
* cardinality="1..1" policy="dynamic" bind="setLoadBalancerConfigurationService"
* unbind="unsetLoadBalancerConfigurationService"
* @scr.reference name="registry.service"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34c47617/components/load-balancer/lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3/pom.xml
----------------------------------------------------------------------
diff --git a/components/load-balancer/lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3/pom.xml b/components/load-balancer/lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3/pom.xml
index 69a7290..000bc99 100644
--- a/components/load-balancer/lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3/pom.xml
+++ b/components/load-balancer/lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3/pom.xml
@@ -63,6 +63,11 @@
<artifactId>org.apache.stratos.lb.common</artifactId>
<version>4.1.3</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2.wso2</groupId>
+ <artifactId>axis2</artifactId>
+ <version>${axis2.wso2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
@@ -96,18 +101,11 @@
org.apache.stratos.lb.endpoint,
org.apache.stratos.lb.endpoint.util,
</Export-Package>
- <!--Import-Package>
- !org.wso2.carbon.lb.endpoint.endpoint,
- !org.wso2.carbon.lb.endpoint,
- org.wso2.carbon.lb.common.*; version=${wso2carbon.version},
- org.wso2.carbon.registry.core.service; version=1.0.1,
- *;resolution:=optional
- </Import-Package-->
<Import-Package>
!org.apache.stratos.lb.endpoint.endpoint,
!org.apache.stratos.lb.endpoint,
- org.apache.stratos.lb.common.*;
- org.wso2.carbon.registry.core.service; version=1.0.1,
+ org.apache.stratos.lb.common.*; version=${project.version},
+ org.apache.stratos.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/34c47617/components/load-balancer/pom.xml
----------------------------------------------------------------------
diff --git a/components/load-balancer/pom.xml b/components/load-balancer/pom.xml
index 4a0551e..14f0507 100644
--- a/components/load-balancer/pom.xml
+++ b/components/load-balancer/pom.xml
@@ -41,6 +41,7 @@
<module>org.apache.stratos.lb.common/4.1.3</module>
<module>autoscaler-service/org.apache.stratos.autoscaler.service/4.1.0</module>
<module>autoscaler/org.apache.stratos.mediator.autoscale/4.1.3</module>
+ <module>lb-endpoint/org.apache.stratos.lb.endpoint/4.1.3</module>
</modules>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34c47617/features/pom.xml
----------------------------------------------------------------------
diff --git a/features/pom.xml b/features/pom.xml
index 3ecc809..ec51cd8 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,12 +22,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <!--parent>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>platform-parent</artifactId>
- <version>4.1.0</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent-->
+ <parent>
+ <groupId>org.apache.stratos</groupId>
+ <artifactId>stratos-parent</artifactId>
+ <version>2.0.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.stratos</groupId>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fef1a6a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fef1a6a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fef1a6a2
Branch: refs/heads/master
Commit: fef1a6a28539013487e3e8dc29bfe887e2866cd2
Parents: 34c4761 9b163dd
Author: Isuru <is...@wso2.com>
Authored: Thu Jul 4 11:27:33 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Thu Jul 4 11:27:33 2013 +0530
----------------------------------------------------------------------
.../2.1.3/pom.xml | 1 +
.../2.1.1/pom.xml | 3 +-
components/stratos/cartridge-agent/pom.xml | 2 +-
.../2.1.1/pom.xml | 78 +++++++++
.../2.1.3/pom.xml | 78 +++++++++
.../2.1.1/pom.xml | 119 ++++++++++++++
.../2.1.3/pom.xml | 143 +++++++++++++++++
.../2.1.3/src/main/resources/build.properties | 1 +
.../resources/conf/cartridge-config.properties | 38 +++++
.../src/main/resources/conf/etc/policies.xsd | 36 +++++
.../2.1.3/src/main/resources/conf/policies.xml | 22 +++
.../2.1.3/src/main/resources/p2.inf | 5 +
.../2.1.1/pom.xml | 82 ++++++++++
.../2.1.3/pom.xml | 82 ++++++++++
features/adc/pom.xml | 42 +++++
.../2.1.1/pom.xml | 78 +++++++++
.../2.1.3/pom.xml | 78 +++++++++
.../2.1.1/pom.xml | 158 +++++++++++++++++++
.../2.1.1/src/main/resources/build.properties | 2 +
.../src/main/resources/conf/agent.properties | 25 +++
.../2.1.1/src/main/resources/p2.inf | 3 +
.../2.1.3/pom.xml | 158 +++++++++++++++++++
.../2.1.3/src/main/resources/build.properties | 2 +
.../src/main/resources/conf/agent.properties | 25 +++
.../2.1.3/src/main/resources/p2.inf | 3 +
.../2.1.1/pom.xml | 83 ++++++++++
features/cartridge-agent/pom.xml | 42 +++++
.../2.1.1/pom.xml | 78 ---------
.../2.1.3/pom.xml | 78 ---------
.../2.1.1/pom.xml | 119 --------------
.../2.1.3/pom.xml | 143 -----------------
.../2.1.3/src/main/resources/build.properties | 1 -
.../resources/conf/cartridge-config.properties | 38 -----
.../src/main/resources/conf/etc/policies.xsd | 36 -----
.../2.1.3/src/main/resources/conf/policies.xml | 22 ---
.../2.1.3/src/main/resources/p2.inf | 5 -
.../2.1.1/pom.xml | 82 ----------
.../2.1.3/pom.xml | 82 ----------
features/stratos/adc-mgt/pom.xml | 42 -----
.../2.1.1/pom.xml | 78 ---------
.../2.1.3/pom.xml | 78 ---------
.../2.1.1/pom.xml | 158 -------------------
.../2.1.1/src/main/resources/build.properties | 2 -
.../src/main/resources/conf/agent.properties | 25 ---
.../2.1.1/src/main/resources/p2.inf | 3 -
.../2.1.3/pom.xml | 158 -------------------
.../2.1.3/src/main/resources/build.properties | 2 -
.../src/main/resources/conf/agent.properties | 25 ---
.../2.1.3/src/main/resources/p2.inf | 3 -
.../2.1.1/pom.xml | 83 ----------
features/stratos/cartridge-agent/pom.xml | 42 -----
51 files changed, 1387 insertions(+), 1385 deletions(-)
----------------------------------------------------------------------