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 2014/10/24 15:39:23 UTC
[1/2] git commit: bundle activemq client jars with LB by default
Repository: stratos
Updated Branches:
refs/heads/master d39f5f7f1 -> 752832f73
bundle activemq client jars with LB by default
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/691bff8d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/691bff8d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/691bff8d
Branch: refs/heads/master
Commit: 691bff8d3d35a26d269102c692100ba19e6b726a
Parents: 8caae55
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Oct 24 19:08:50 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Oct 24 19:08:50 2014 +0530
----------------------------------------------------------------------
products/load-balancer/modules/distribution/pom.xml | 16 ++++++++++++++++
.../modules/distribution/src/main/assembly/bin.xml | 3 +++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/691bff8d/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 5580b49..9bd0469 100755
--- a/products/load-balancer/modules/distribution/pom.xml
+++ b/products/load-balancer/modules/distribution/pom.xml
@@ -446,6 +446,22 @@
<artifactId>org.wso2.carbon.relay</artifactId>
<version>${carbon.version}</version>
</dependency>
+ <!-- activemq client jars -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.hawtbuf</groupId>
+ <artifactId>hawtbuf</artifactId>
+ <version>1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ <version>5.9.1</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>mqtt-client</artifactId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/691bff8d/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 2dbdaad..7185808 100755
--- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
+++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml
@@ -199,6 +199,9 @@
<dependencySet>
<outputDirectory>apache-stratos-load-balancer-${pom.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>
+ <include>org.fusesource.hawtbuf:hawtbuf:jar</include>
<include>org.eclipse.paho:mqtt-client:jar</include>
</includes>
</dependencySet>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/752832f7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/752832f7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/752832f7
Branch: refs/heads/master
Commit: 752832f73eb0eb8b67c6ee06951f81af2ace373c
Parents: 691bff8 d39f5f7
Author: R-Rajkumar <rr...@gmail.com>
Authored: Fri Oct 24 19:09:05 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Oct 24 19:09:05 2014 +0530
----------------------------------------------------------------------
.../autoscaler/api/AutoScalerServiceImpl.java | 18 ++++--
.../interfaces/AutoScalerServiceInterface.java | 4 ++
.../autoscaler/policy/PolicyManager.java | 67 +++++++++++++++++---
3 files changed, 77 insertions(+), 12 deletions(-)
----------------------------------------------------------------------