You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/11/25 14:55:55 UTC

[1/2] git commit: Added apache commons lang3 dependency to adc management server feature

Updated Branches:
  refs/heads/master da391046f -> 99fdf3446


Added apache commons lang3 dependency to adc management server feature


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/754220f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/754220f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/754220f7

Branch: refs/heads/master
Commit: 754220f72d07545e7ef5ede9e85433be90dfe2bb
Parents: 4316ae2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Nov 25 19:25:06 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 25 19:25:06 2013 +0530

----------------------------------------------------------------------
 .../pom.xml                                        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/754220f7/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
index d1ec5d6..944132d 100644
--- a/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
+++ b/features/adc/org.apache.stratos.adc.mgt.server.feature/pom.xml
@@ -127,14 +127,15 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt:${project.version}</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${project.version}</bundleDef>
-				<bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
-				<bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef>
-				<bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
-				<bundleDef>com.google.code.gson:gson:2.1</bundleDef>
-				<bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
-				<bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
-			    </bundles>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.adc.mgt.stub:${project.version}</bundleDef>
+                                <bundleDef>org.wso2.andes.wso2:andes-client:0.13.wso2v6</bundleDef>
+                                <bundleDef>org.apache.stratos:org.apache.stratos.cloud.controller.service.stub:${project.version}</bundleDef>
+                                <bundleDef>com.gitblit:gitblit:1.2.0.wso2v1</bundleDef>
+                                <bundleDef>com.google.code.gson:gson:2.1</bundleDef>
+                                <bundleDef>org.apache.commons:commons-lang3:3.1</bundleDef>
+                                <bundleDef>org.eclipse.jgit:org.eclipse.jgit:2.1.0.wso2v1</bundleDef>
+                                <bundleDef>com.jcraft:jsch:0.1.49.wso2v1</bundleDef>
+                            </bundles>
                         </configuration>
                     </execution>
                 </executions>


[2/2] git commit: Merge remote-tracking branch 'origin/master'

Posted by im...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/99fdf344
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/99fdf344
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/99fdf344

Branch: refs/heads/master
Commit: 99fdf344643993dc626c6b075591d154def51531
Parents: 754220f da39104
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Nov 25 19:25:47 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Nov 25 19:25:47 2013 +0530

----------------------------------------------------------------------
 .../HealthStatisticsEventBuilder.xml            | 10 ++++++++
 .../AverageLoadAverageEventFormatter.xml        | 11 +++++++++
 .../AverageMemoryConsumptionEventFormatter.xml  | 11 +++++++++
 .../FaultMessageEventFormatter.xml              | 11 +++++++++
 .../GradientLoadAverageEventFormatter.xml       | 11 +++++++++
 .../GradientMemoryConsumptionEventFormatter.xml | 11 +++++++++
 ...econdDerivativeLoadAverageEventFormatter.xml | 11 +++++++++
 ...erivativeMemoryConsumptionEventFormatter.xml | 11 +++++++++
 .../executionplans/AverageHeathRequest.xml      | 21 +++++++++++++++++
 .../executionplans/GradientOfHealthRequest.xml  | 24 ++++++++++++++++++++
 .../SecondDerivativeOfHealthRequest.xml         | 21 +++++++++++++++++
 .../src/main/bin/event-subscriber.sh            |  4 ++--
 12 files changed, 155 insertions(+), 2 deletions(-)
----------------------------------------------------------------------