You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/17 12:45:51 UTC
[1/2] git commit: fixing class loading issue STRATOS-301
Updated Branches:
refs/heads/master 29671ce62 -> 502db4103
fixing class loading issue STRATOS-301
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5eb352bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5eb352bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5eb352bf
Branch: refs/heads/master
Commit: 5eb352bf6de86b12a68ff2efe3975d46b29075d2
Parents: c01173c
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Dec 17 17:14:21 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Dec 17 17:14:21 2013 -0500
----------------------------------------------------------------------
service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5eb352bf/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
----------------------------------------------------------------------
diff --git a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
index cc15b50..0c138c6 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
@@ -91,12 +91,10 @@
org.apache.stratos.autoscaler.deployment.policy.*; version=${project.version},
org.apache.stratos.autoscaler.policy.model.*; version=${project.version},
org.apache.stratos.autoscaler.exception.*; version=${project.version},
- org.apache.stratos.cloud.controller.deployment.*; version=${project.version},
org.apache.stratos.autoscaler.partition.*; version=${project.version},
org.apache.stratos.autoscaler.api.*; version=${project.version}
</Export-Package>
<Private-Package>
- org.apache.stratos.cloud.controller.deployment.partition.*; version=${project.version}
</Private-Package>
<Import-Package>
*;resolution:=optional
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/502db410
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/502db410
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/502db410
Branch: refs/heads/master
Commit: 502db410320c4f2bf6abd530c02f1d2787eaefcf
Parents: 5eb352b 29671ce
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Dec 17 17:15:47 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Dec 17 17:15:47 2013 -0500
----------------------------------------------------------------------
.../service/ServiceDeploymentManager.java | 2 +
.../manager/CartridgeSubscriptionManager.java | 3 +
.../adc/mgt/payload/BasicPayloadData.java | 37 ++-
.../stratos/adc/mgt/payload/PayloadData.java | 18 +-
.../apache/stratos/autoscaler/Constants.java | 15 +-
.../health/HealthEventMessageDelegator.java | 25 +-
.../stratos/cli/RestCommandLineService.java | 1 -
.../org/apache/stratos/rest/endpoint/Utils.java | 40 +++
.../endpoint/exception/RestAPIException.java | 20 ++
.../handlers/CustomExceptionMapper.java | 37 +++
.../handlers/StratosAuthenticationHandler.java | 19 +-
.../handlers/StratosAuthorizingHandler.java | 14 +-
.../rest/endpoint/services/StratosAdmin.java | 2 +-
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 2 +
.../src/main/webapp/WEB-INF/web.xml | 4 +-
.../HealthStatisticsEventBuilder.xml | 10 -
.../InstanceStatusStatisticsBuilder.xml | 10 -
.../LoadBalancerStatisticsEventBuilder.xml | 10 -
.../AverageInFlightRequestsEventFormatter.xml | 11 -
.../AverageLoadAverageEventFormatter.xml | 11 -
.../AverageMemoryConsumptionEventFormatter.xml | 11 -
.../FaultMessageEventFormatter.xml | 11 -
.../GradientInFlightRequestsEventFormatter.xml | 11 -
.../GradientLoadAverageEventFormatter.xml | 11 -
.../GradientMemoryConsumptionEventFormatter.xml | 11 -
...DerivativeInFlightRequestsEventFormatter.xml | 11 -
...econdDerivativeLoadAverageEventFormatter.xml | 11 -
...erivativeMemoryConsumptionEventFormatter.xml | 11 -
.../HealthStatisticsEventBuilder.xml | 10 +
.../InstanceStatusStatisticsBuilder.xml | 10 +
.../LoadBalancerStatisticsEventBuilder.xml | 10 +
.../AverageInFlightRequestsEventFormatter.xml | 11 +
.../AverageLoadAverageEventFormatter.xml | 11 +
.../AverageMemoryConsumptionEventFormatter.xml | 11 +
.../FaultMessageEventFormatter.xml | 11 +
.../GradientInFlightRequestsEventFormatter.xml | 11 +
.../GradientLoadAverageEventFormatter.xml | 11 +
.../GradientMemoryConsumptionEventFormatter.xml | 11 +
.../MemberAverageLoadAverageEventFormatter.xml | 11 +
...erAverageMemoryConsumptionEventFormatter.xml | 11 +
.../MemberGradientLoadAverageEventFormatter.xml | 11 +
...rGradientMemoryConsumptionEventFormatter.xml | 11 +
...econdDerivativeLoadAverageEventFormatter.xml | 11 +
...erivativeMemoryConsumptionEventFormatter.xml | 11 +
...DerivativeInFlightRequestsEventFormatter.xml | 11 +
...econdDerivativeLoadAverageEventFormatter.xml | 11 +
...erivativeMemoryConsumptionEventFormatter.xml | 11 +
.../execution-plans/AverageHeathRequest.xml | 23 --
.../AverageInFlightRequestsFinder.xml | 19 --
.../execution-plans/GradientOfHealthRequest.xml | 21 --
.../GradientOfRequestsInFlightFinder.xml | 18 --
.../SecondDerivativeOfHealthRequest.xml | 21 --
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 --
.../executionplans/AverageHeathRequest.xml | 29 ++
.../AverageInFlightRequestsFinder.xml | 19 ++
.../executionplans/GradientOfHealthRequest.xml | 30 +++
.../GradientOfRequestsInFlightFinder.xml | 18 ++
.../SecondDerivativeOfHealthRequest.xml | 27 ++
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 ++
.../DefaultWSO2EventInputAdaptor.xml | 3 -
.../DefaultWSO2EventInputAdaptor.xml | 3 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 -
.../output-event-adaptors/JMSOutputAdaptor.xml | 8 -
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 +
.../stream-manager-config.xml | 175 ------------
.../streamdefinitions/stream-manager-config.xml | 269 +++++++++++++++++++
.../src/main/bin/health-publisher.sh | 2 +-
.../agent/health/publisher/HealthPublisher.java | 8 +-
tools/stratos-installer/conf/setup.conf | 14 +-
.../repository/conf/cartridge-config.properties | 8 +-
tools/stratos-installer/setup.sh | 128 +++++----
tools/stratos-installer/start-servers.sh | 19 +-
73 files changed, 923 insertions(+), 586 deletions(-)
----------------------------------------------------------------------