stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [4/5] stratos git commit: Updating autoscaler/cloud controller wsdls, service-stubs and references
Date Mon, 29 Dec 2014 07:28:06 GMT
Updating autoscaler/cloud controller wsdls, service-stubs and references


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

Branch: refs/heads/master
Commit: bf51dbfd76fd877d5f37d5bf370bad818d642501
Parents: 53c04a5
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Mon Dec 29 12:53:49 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Mon Dec 29 12:57:56 2014 +0530

----------------------------------------------------------------------
 .../util/converter/ObjectConverter.java         |   13 -
 .../extension/FaultHandlingWindowProcessor.java |    2 +-
 .../src/main/conf/drools/scaling.drl            |    1 -
 .../src/main/resources/AutoScalerService.wsdl   | 1390 ++++++------------
 .../main/resources/CloudControllerService.wsdl  |  643 ++++----
 5 files changed, 778 insertions(+), 1271 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/bf51dbfd/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
index c439342..b2dccb4 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/util/converter/ObjectConverter.java
@@ -108,22 +108,9 @@ public class ObjectConverter {
             String[] propertiesArray = propertiesList.toArray(new String[propertiesList.size()]);
             cartridgeConfig.setExportingProperties(propertiesArray);
         }
-
-        if (cartridgeDefinitionBean.getContainer() != null) {
-            cartridgeConfig.setContainer(convertContainerBeanToStubContainer(cartridgeDefinitionBean.getContainer()));
-        }
-
         return cartridgeConfig;
     }
 
-    private static Container convertContainerBeanToStubContainer(ContainerBean containerBean)
{
-        Container container = new Container();
-        container.setDockerFileRepo(containerBean.getDockerfileRepo());
-        container.setImageName(containerBean.getImageName());
-        //container.setProperties(convertPropertyBeansToStubProperties(containerBean.getProperty()));
-        return container;
-    }
-
     private static PortMapping[] convertPortMappingBeansToStubPortMappings(List<PortMappingBean>
portMappingBeans) {
 
         //convert to an array

http://git-wip-us.apache.org/repos/asf/stratos/blob/bf51dbfd/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index c567824..1934f14 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -106,7 +106,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements
Run
 		//so we are checking the topology for the member existence
 		Member member = getMemberFromId(id);
 		if (null == member) {
-			log.debug("Member not found in the toplogy. Event rejected");
+			log.debug("Member not found in the topology. Event rejected");
 			return;
 		}
         if (StringUtils.isNotEmpty(id)) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/bf51dbfd/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
----------------------------------------------------------------------
diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
index 4aa81f7..48b5e29 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -18,7 +18,6 @@
  */
 
 package org.apache.stratos.autoscaler
-//import org.netbeans.lib.cvsclient.commandLine.command.log.rule;
 
 import org.apache.stratos.messaging.domain.topology.Service;
 import org.apache.stratos.messaging.domain.topology.Cluster;


Mime
View raw message