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/07/25 17:41:42 UTC
[1/2] git commit: Correct errors in products/cloud_controller pom
files
Updated Branches:
refs/heads/master 5b960870e -> 478868a13
Correct errors in products/cloud_controller pom files
Signed-off-by: Lakmal Warusawithana <la...@wso2.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9bed6a12
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9bed6a12
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9bed6a12
Branch: refs/heads/master
Commit: 9bed6a12bea0d93969bf1df671ff93543f374fd6
Parents: b9cca03
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Wed Jul 24 19:52:23 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Wed Jul 24 21:20:51 2013 +0530
----------------------------------------------------------------------
products/cloud_controller/modules/p2-profile/pom.xml | 2 +-
products/cloud_controller/pom.xml | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9bed6a12/products/cloud_controller/modules/p2-profile/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/modules/p2-profile/pom.xml b/products/cloud_controller/modules/p2-profile/pom.xml
index 683ef49..79bca3b 100644
--- a/products/cloud_controller/modules/p2-profile/pom.xml
+++ b/products/cloud_controller/modules/p2-profile/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.stratos.cc</groupId>
<artifactId>cc-parent</artifactId>
- <version>1.0.1</version>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9bed6a12/products/cloud_controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/cloud_controller/pom.xml b/products/cloud_controller/pom.xml
index 26fff8d..e1a449f 100644
--- a/products/cloud_controller/pom.xml
+++ b/products/cloud_controller/pom.xml
@@ -25,7 +25,6 @@
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-products-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@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/478868a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/478868a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/478868a1
Branch: refs/heads/master
Commit: 478868a13574326478a557781ba82f86f36970b6
Parents: 9bed6a1 5b96087
Author: Lakmal Warusawithana <la...@wso2.com>
Authored: Thu Jul 25 21:10:59 2013 +0530
Committer: Lakmal Warusawithana <la...@wso2.com>
Committed: Thu Jul 25 21:10:59 2013 +0530
----------------------------------------------------------------------
components/org.apache.stratos.adc.mgt/pom.xml | 2 +-
.../org.apache.stratos.adc.topology.mgt/pom.xml | 4 +-
.../org.apache.stratos.cartridge.agent/pom.xml | 6 +-
.../InstanceStateNotificationClientThread.java | 2 +-
.../org.apache.stratos.cartridge.mgt.ui/pom.xml | 2 +-
.../web/cartridge-mgt/available_cartridges.jsp | 6 +-
.../cartridge-mgt/map_domain_ajaxprocessor.jsp | 2 +-
.../remove_domain_ajaxprocessor.jsp | 2 +-
.../resources/web/cartridge-mgt/subscribe.jsp | 2 +-
.../cartridge-mgt/subscribe_ajaxprocessor.jsp | 4 +-
.../web/cartridge-mgt/subscribed_cartridges.jsp | 4 +-
.../subscribed_cartridges_ajaxprocessor.jsp | 4 +-
.../cartridge-mgt/sync_repo_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/test_git_ajaxprocessor.jsp | 2 +-
.../cartridge-mgt/unsubscribe_ajaxprocessor.jsp | 2 +-
components/org.apache.stratos.lb.agent/pom.xml | 74 +
.../balance/agent/LoadBalanceAgentService.java | 55 +
.../src/main/resources/META-INF/services.xml | 31 +
.../LoadBalanceEndpointServiceComponent.java | 2 +-
.../pom.xml | 74 -
.../balance/agent/LoadBalanceAgentService.java | 55 -
.../src/main/resources/META-INF/services.xml | 31 -
.../pom.xml | 4 +-
.../pom.xml | 2 +-
.../clients/common/LoadBalanceAgentClient.java | 2 +-
.../find-tenant-ajaxprocessor.jsp | 4 +-
.../tenant-activity/get-data-ajaxprocessor.jsp | 4 +-
components/org.apache.stratos.theme.mgt/pom.xml | 6 +-
.../TenantThemeMgtServiceComponent.java | 2 +-
.../theme/mgt/util/ThemeLoadingListener.java | 6 +-
.../stratos/theme/mgt/util/ThemeUtil.java | 4 +-
components/pom.xml | 2 +-
components/stratos/pom.xml | 22 +-
.../pom.xml | 4 +-
.../src/main/resources/p2.inf | 6 +-
.../pom.xml | 4 +-
.../pom.xml | 4 +-
.../org.apache.stratos.lb.agent.feature/pom.xml | 84 ++
.../pom.xml | 81 +
.../pom.xml | 79 +
.../pom.xml | 84 --
.../pom.xml | 81 -
.../pom.xml | 79 -
features/manager/load-balance-agent/pom.xml | 10 +-
.../pom.xml | 4 +-
products/cloud_controller/README.txt | 4 +-
.../distribution/src/main/assembly/bin.xml | 7 +-
.../cloud_controller/modules/p2-profile/pom.xml | 4 +-
.../distribution/src/main/assembly/bin.xml | 2 +-
.../modules/cloud-service-mgt/pom.xml | 6 +-
.../modules/dashboard/pom.xml | 6 +-
.../ui/clients/CloudManagerServiceClient.java | 4 +-
.../cloud_services_configuration.jsp | 2 +-
.../resources/web/tenant-dashboard/index.jsp | 2 +-
.../modules/distribution/LICENSE.txt | 4 +-
.../org.apache.stratos.ui.feature/pom.xml | 10 +-
.../modules/p2-profile-gen/pom.xml | 28 +-
products/stratos_controller/pom.xml | 4 +-
.../pom.xml | 1 -
.../pom.xml | 2 +-
.../org.apache.stratos.billing.mgt.stub/pom.xml | 122 ++
.../resources/MultitenancyBillingService.wsdl | 781 ++++++++++
.../org.apache.stratos.lb.agent.stub/pom.xml | 114 ++
.../main/resources/LoadBalanceAgentService.wsdl | 90 ++
.../pom.xml | 118 ++
.../src/main/resources/AutoscalerService.wsdl | 420 ++++++
.../pom.xml | 132 ++
.../main/resources/CloudControllerService.wsdl | 678 +++++++++
.../pom.xml | 114 --
.../main/resources/LoadBalanceAgentService.wsdl | 90 --
.../pom.xml | 118 --
.../src/main/resources/AutoscalerService.wsdl | 420 ------
.../pom.xml | 132 --
.../main/resources/CloudControllerService.wsdl | 678 ---------
.../pom.xml | 119 ++
.../src/main/resources/CloudManagerService.wsdl | 331 +++++
.../org.apache.stratos.throttle.stub/pom.xml | 128 ++
.../main/resources/ThrottleAdminService.wsdl | 635 ++++++++
.../pom.xml | 125 ++
.../src/main/resources/MeteringQueryDS.wsdl | 636 ++++++++
.../pom.xml | 130 ++
.../resources/MeteringSummaryGenerationDS.wsdl | 1396 ++++++++++++++++++
.../4.1.0/pom.xml | 116 --
.../resources/MultitenancyBillingService.wsdl | 781 ----------
.../4.1.0/pom.xml | 117 --
.../src/main/resources/CloudManagerService.wsdl | 331 -----
.../org.wso2.carbon.throttle.stub/4.1.0/pom.xml | 120 --
.../main/resources/ThrottleAdminService.wsdl | 635 --------
.../4.1.0/pom.xml | 118 --
.../src/main/resources/MeteringQueryDS.wsdl | 636 --------
.../4.1.0/pom.xml | 121 --
.../resources/MeteringSummaryGenerationDS.wsdl | 1396 ------------------
service-stubs/pom.xml | 11 +-
93 files changed, 6479 insertions(+), 6442 deletions(-)
----------------------------------------------------------------------