You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2013/08/14 23:59:02 UTC
[1/3] git commit: adding few comments
Updated Branches:
refs/heads/master 0fc815786 -> 899b4dd4a
adding few comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/35804acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/35804acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/35804acb
Branch: refs/heads/master
Commit: 35804acb754b0d6e3ad4a926658258c565b6884e
Parents: 10b96f1
Author: Nirmal Fernando <ni...@apache.org>
Authored: Fri Aug 9 12:08:47 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Fri Aug 9 12:08:47 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cloud/controller/util/IaasContext.java | 8 ++++++++
.../stratos/cloud/controller/util/ServiceContext.java | 9 ---------
2 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35804acb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasContext.java
index 2e6df1d..a82c4e3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/IaasContext.java
@@ -38,8 +38,16 @@ public class IaasContext implements Serializable{
private List<String> nodeIds;
+ /**
+ * Key - node id
+ * Value - public ip
+ */
private Map<String, String> nodeToPublicIp;
+ /**
+ * Key - node id
+ * Value - NodeMetadata object which has information on this node.
+ */
private transient Map<String, NodeMetadata> nodes;
private List<String> toBeRemovedNodeIds;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/35804acb/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
index 7702d24..6b399e1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/ServiceContext.java
@@ -134,15 +134,6 @@ public class ServiceContext implements Serializable{
public void setIaasContextMap(Map<String, IaasContext> map){
iaasCtxts = map;
}
-
-// public byte[] getPayload() {
-// return payload;
-// }
-//
-// public void setPayload(byte[] payload) {
-// this.payload = payload;
-// }
-
public String getPayloadFile() {
return payloadFilePath;
[2/3] git commit: deleting unnecessary empty class
Posted by ni...@apache.org.
deleting unnecessary empty class
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/046e4b5a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/046e4b5a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/046e4b5a
Branch: refs/heads/master
Commit: 046e4b5a736f33126ffac1394ce8dba10c331bc7
Parents: 35804ac
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Aug 15 03:25:33 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Aug 15 03:25:33 2013 +0530
----------------------------------------------------------------------
.../adc/topology/mgt/subscriber/TopologySubscriberTask.java | 1 -
components/org.apache.stratos.cloud.controller/pom.xml | 4 ++--
components/org.apache.stratos.lb.common/pom.xml | 5 +++++
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/046e4b5a/components/org.apache.stratos.adc.topology.mgt/src/main/java/org/apache/stratos/adc/topology/mgt/subscriber/TopologySubscriberTask.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.topology.mgt/src/main/java/org/apache/stratos/adc/topology/mgt/subscriber/TopologySubscriberTask.java b/components/org.apache.stratos.adc.topology.mgt/src/main/java/org/apache/stratos/adc/topology/mgt/subscriber/TopologySubscriberTask.java
deleted file mode 100644
index 525de89..0000000
--- a/components/org.apache.stratos.adc.topology.mgt/src/main/java/org/apache/stratos/adc/topology/mgt/subscriber/TopologySubscriberTask.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.apache.stratos.adc.topology.mgt.subscriber;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/046e4b5a/components/org.apache.stratos.cloud.controller/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/pom.xml b/components/org.apache.stratos.cloud.controller/pom.xml
index 7e660aa..a6733c5 100644
--- a/components/org.apache.stratos.cloud.controller/pom.xml
+++ b/components/org.apache.stratos.cloud.controller/pom.xml
@@ -107,8 +107,8 @@
!org.apache.commons.logging,
org.apache.commons.logging; version=0.0.0,
org.wso2.carbon.utils.*,
- <!--org.jclouds.compute*;version="${jclouds.version}";resolution:=optional,
- org.jclouds*;version="${jclouds.version}",-->
+ org.jclouds.compute*;version="${jclouds.version}";resolution:=optional,
+ org.jclouds*;version="${jclouds.version}",
*; resolution:=optional
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/046e4b5a/components/org.apache.stratos.lb.common/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.lb.common/pom.xml b/components/org.apache.stratos.lb.common/pom.xml
index ec6f68b..049e8fc 100644
--- a/components/org.apache.stratos.lb.common/pom.xml
+++ b/components/org.apache.stratos.lb.common/pom.xml
@@ -54,6 +54,11 @@
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
<!--dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ni...@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/899b4dd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/899b4dd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/899b4dd4
Branch: refs/heads/master
Commit: 899b4dd4a10d70b25d901887349df603bfc7d859
Parents: 046e4b5 0fc8157
Author: Nirmal Fernando <ni...@apache.org>
Authored: Thu Aug 15 03:28:07 2013 +0530
Committer: Nirmal Fernando <ni...@apache.org>
Committed: Thu Aug 15 03:28:07 2013 +0530
----------------------------------------------------------------------
.../pom.xml | 87 --
.../service/RepositorySynchronizer.java | 37 -
.../src/main/webapp/WEB-INF/cxf-servlet.xml | 35 -
.../src/main/webapp/WEB-INF/web.xml | 51 -
.../src/main/webapp/servicelist.css | 117 --
.../adc/mgt/utils/PersistenceManager.java | 5 +-
.../dependency-reduced-pom.xml | 112 --
.../pom.xml | 208 ---
.../autoscaler/service/IAutoscalerService.java | 112 --
.../exception/AutoscalerServiceException.java | 33 -
.../exception/DeserializationException.java | 33 -
.../MalformedConfigurationFileException.java | 33 -
.../exception/NoInstanceFoundException.java | 39 -
.../exception/SerializationException.java | 33 -
.../service/impl/AutoscalerServiceImpl.java | 1389 ------------------
.../internal/AutoscalerServiceDSComponent.java | 48 -
.../autoscaler/service/io/Deserializer.java | 68 -
.../autoscaler/service/io/Serializer.java | 61 -
.../service/jcloud/ComputeServiceBuilder.java | 65 -
.../service/util/AutoscalerConstant.java | 73 -
.../autoscaler/service/util/IaasContext.java | 391 -----
.../autoscaler/service/util/IaasProvider.java | 141 --
.../service/util/InstanceContext.java | 93 --
.../service/util/ServiceTemplate.java | 84 --
.../xml/ElasticScalerConfigFileReader.java | 557 -------
.../src/main/resources/META-INF/services.xml | 9 -
.../service/util/IaasContextComparatorTest.java | 98 --
.../service/util/IaasContextTest.java | 113 --
.../xml/ElasticScalerConfigFileReaderTest.java | 60 -
.../test/resources/elastic-scaler-config.xml | 71 -
.../src/main/resources/META-INF/services.xml | 2 +-
.../org.apache.stratos.cloud.controller/pom.xml | 207 +--
.../cloud/controller/iaases/AWSEC2Iaas.java | 33 +-
.../controller/iaases/OpenstackNovaIaas.java | 64 +-
.../impl/CloudControllerServiceImpl.java | 2 +-
.../controller/topic/AMQPTopologyPublisher.java | 119 ++
.../topic/WSO2MBTopologyPublisher.java | 108 --
.../util/CloudControllerConstants.java | 11 +-
.../cloud/controller/util/TopologyConfig.java | 4 +-
.../src/test/resources/cloud-controller.xml | 1 -
.../org.apache.stratos.deployment/pom.xml | 9 -
components/org.apache.stratos.lb.agent/pom.xml | 2 -
components/org.apache.stratos.lb.common/pom.xml | 1 -
.../pom.xml | 8 -
.../pom.xml | 11 -
.../org.apache.stratos.tenant.activity/pom.xml | 6 -
.../org.apache.stratos.theme.mgt.ui/pom.xml | 11 -
.../pom.xml | 192 ++-
components/org.apache.stratos.usage.ui/pom.xml | 13 +-
components/pom.xml | 27 +-
.../pom.xml | 96 +-
features/cloud-controller/pom.xml | 4 -
features/manager/pom.xml | 9 -
.../pom.xml | 1 -
features/pom.xml | 23 -
pom.xml | 131 +-
products/cloud-controller/LICENSE.txt | 1102 +++++++-------
products/cloud-controller/NOTICE | 5 +
.../modules/distribution/pom.xml | 2 -
.../src/main/assembly/filter.properties | 21 +-
.../distribution/src/main/resources/launch.ini | 1 +
.../cloud-controller/modules/p2-profile/pom.xml | 2 -
products/cloud-controller/pom.xml | 54 -
products/elb/modules/distribution/pom.xml | 2 -
.../src/main/assembly/filter.properties | 21 +-
.../distribution/src/main/conf/axis2.xml | 44 +-
.../src/main/conf/loadbalancer.conf | 64 +-
products/elb/modules/p2-profile/pom.xml | 2 -
products/elb/pom.xml | 67 -
.../stratos-agent/modules/distribution/pom.xml | 17 -
.../distribution/src/main/assembly/bin.xml | 14 +-
.../distribution/src/main/assembly/dist.xml | 39 -
.../src/main/assembly/filter.properties | 2 +-
.../distribution/src/main/assembly/src.xml | 74 -
.../stratos-agent/modules/p2-profile/pom.xml | 2 -
products/stratos-agent/pom.xml | 66 -
.../billing-script/billing-h2.sql | 109 --
.../billing-script/billing-mysql.sql | 120 --
.../billing-script/metering_h2.sql | 114 --
.../billing-script/metering_mysql.sql | 149 --
.../billing-script/migration.sql | 7 -
.../stratos-controller/billing-script/s2_h2.sql | 96 --
.../billing-script/stratos_mysql.sql | 121 --
.../billing-script/wso2_rss.sql | 81 -
.../conf/features-dashboard.xml | 743 +---------
.../conf/metering-config-non-manager.xml | 52 +-
.../stratos-controller/dbscripts/billing-h2.sql | 109 ++
.../dbscripts/billing-mysql.sql | 120 ++
.../dbscripts/metering_h2.sql | 114 ++
.../dbscripts/metering_mysql.sql | 149 ++
.../stratos-controller/dbscripts/migration.sql | 7 +
products/stratos-controller/dbscripts/s2_h2.sql | 96 ++
.../dbscripts/stratos_mysql.sql | 121 ++
.../stratos-controller/dbscripts/wso2_rss.sql | 81 +
.../CloudServiceMgtServiceComponent.java | 2 +-
.../manager/services/mgt/util/Constants.java | 4 +-
.../modules/dashboard/pom.xml | 11 -
.../cloud_services_configuration.jsp | 6 +-
.../cloud_services_save_ajaxprocessor.jsp | 2 +-
.../resources/web/tenant-dashboard/index.jsp | 2 +-
.../modules/distribution/LICENSE.txt | 12 +-
.../modules/distribution/pom.xml | 8 +-
.../modules/distribution/src/assembly/bin.xml | 2 +-
.../WebContent/dashboards/server.jsp | 12 +-
.../WebContent/tenant-dashboard/index.jsp | 12 +-
.../modules/features-dashboard/pom.xml | 23 -
.../stratos-controller/modules/features/pom.xml | 7 -
.../modules/integration/pom.xml | 1 -
.../stratos-controller/modules/login/pom.xml | 11 -
.../domain_rename_checker_ajaxprocessor.jsp | 2 +-
.../modules/p2-profile-gen/pom.xml | 2 -
.../stratos-controller/modules/styles/pom.xml | 178 ++-
.../modules/styles/product/pom.xml | 85 --
.../src/main/resources/META-INF/product.xml | 28 -
.../src/main/resources/web/product/about.html | 132 --
.../src/main/resources/web/styles/css/main.css | 155 --
.../main/resources/web/styles/images/1px.gif | Bin 43 -> 0 bytes
.../styles/images/esb-server-menu-header.gif | Bin 176 -> 0 bytes
.../web/styles/images/leftRightSlider-dark.png | Bin 1103 -> 0 bytes
.../resources/web/styles/images/menu_header.png | Bin 227 -> 0 bytes
.../web/styles/images/right-links-bg.gif | Bin 1070 -> 0 bytes
.../web/styles/images/right-logo-bg.gif | Bin 3445 -> 0 bytes
.../resources/web/styles/images/sc-back.png | Bin 16781 -> 0 bytes
.../web/styles/images/sc-header-repeat.png | Bin 178 -> 0 bytes
.../main/resources/web/styles/images/sclogo.png | Bin 5136 -> 0 bytes
.../modules/styles/service/pom.xml | 143 --
.../src/main/resources/META-INF/product.xml | 27 -
.../service/src/main/resources/web/favicon.ico | Bin 17542 -> 0 bytes
.../src/main/resources/web/styles/css/main.css | 240 ---
.../resources/web/styles/images/def-body-bg.gif | Bin 419 -> 0 bytes
.../web/styles/images/def-header-bg.gif | Bin 17875 -> 0 bytes
.../web/styles/images/def-header-region-bg.gif | Bin 22784 -> 0 bytes
.../main/resources/web/styles/images/logo.gif | Bin 1815 -> 0 bytes
.../resources/web/styles/images/powered.gif | Bin 1773 -> 0 bytes
.../resources/web/styles/images/right-logo.gif | Bin 6102 -> 0 bytes
.../web/styles/images/t-right-logo.gif | Bin 3629 -> 0 bytes
.../src/main/resources/META-INF/product.xml | 27 +
.../styles/src/main/resources/web/favicon.ico | Bin 0 -> 17542 bytes
.../src/main/resources/web/styles/css/main.css | 240 +++
.../resources/web/styles/images/def-body-bg.gif | Bin 0 -> 419 bytes
.../web/styles/images/def-header-bg.gif | Bin 0 -> 17875 bytes
.../web/styles/images/def-header-region-bg.gif | Bin 0 -> 22784 bytes
.../main/resources/web/styles/images/logo.gif | Bin 0 -> 3476 bytes
.../resources/web/styles/images/powered.gif | Bin 0 -> 1773 bytes
.../resources/web/styles/images/right-logo.gif | Bin 0 -> 6102 bytes
.../web/styles/images/t-right-logo.gif | Bin 0 -> 3629 bytes
products/stratos-controller/pom.xml | 80 -
.../resources/allthemes/Dark/admin/logo.gif | Bin 1551 -> 3476 bytes
.../resources/allthemes/Default/admin/logo.gif | Bin 1815 -> 3476 bytes
.../resources/allthemes/Light/admin/logo.gif | Bin 1551 -> 3476 bytes
.../resources/cloud-services-icons/pom.xml | 38 +-
.../org.apache.stratos.account.mgt.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.adc.mgt.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.billing.mgt.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.common.stub/pom.xml | 1 -
.../org.apache.stratos.lb.agent.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.tenant.mgt.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.theme.mgt.stub/pom.xml | 12 -
.../org.apache.stratos.throttle.stub/pom.xml | 1 -
.../pom.xml | 1 -
.../org.apache.stratos.throttling.stub/pom.xml | 1 -
.../pom.xml | 9 -
.../pom.xml | 9 -
.../org.apache.stratos.usage.stub/pom.xml | 9 -
.../pom.xml | 1 -
.../init_scripts/tomcat/stratos-init.sh | 164 ++-
.../init_scripts/tomcat/stratos.pem | 16 -
.../init_scripts/tomcat/wso2.pem | 16 +
tools/ec2-demo-setup/config.sh | 5 +-
tools/ec2-demo-setup/tempconfigs/nodes.pp | 465 ------
181 files changed, 2606 insertions(+), 8953 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/899b4dd4/components/org.apache.stratos.lb.common/pom.xml
----------------------------------------------------------------------