You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/10 10:47:36 UTC
git commit: changes related to autoscaler stub
Updated Branches:
refs/heads/master aebdb0879 -> 93ee2368a
changes related to autoscaler stub
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/93ee2368
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/93ee2368
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/93ee2368
Branch: refs/heads/master
Commit: 93ee2368a714931d4be94e83c3df581150f2918c
Parents: aebdb08
Author: Isuru <is...@wso2.com>
Authored: Tue Dec 10 15:17:00 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Tue Dec 10 15:17:00 2013 +0530
----------------------------------------------------------------------
.../adc/mgt/client/AutoscalerServiceClient.java | 4 ++--
.../endpoint/bean/util/converter/PojoConverter.java | 14 +++++++-------
.../stratos/rest/endpoint/services/ServiceUtils.java | 2 +-
.../pom.xml | 5 ++++-
4 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93ee2368/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
index 186ea36..a069221 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/client/AutoscalerServiceClient.java
@@ -113,10 +113,10 @@ public class AutoscalerServiceClient {
return partitions;
}
- public org.apache.stratos.autoscaler.partition.xsd.PartitionGroup [] getPartitionGroups (String deploymentPolicyId)
+ public org.apache.stratos.autoscaler.partition.PartitionGroup [] getPartitionGroups (String deploymentPolicyId)
throws Exception{
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup [] partitionGroups;
+ org.apache.stratos.autoscaler.partition.PartitionGroup [] partitionGroups;
try {
partitionGroups = stub.getPartitionGroups(deploymentPolicyId);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93ee2368/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
index 6320989..81ff0c5 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/bean/util/converter/PojoConverter.java
@@ -231,14 +231,14 @@ public class PojoConverter {
return deploymentPolicy;
}
- private static org.apache.stratos.autoscaler.partition.xsd.PartitionGroup[] convertToCCPartitionGroup (List<PartitionGroup> partitionGroupBeans) {
+ private static org.apache.stratos.autoscaler.partition.PartitionGroup[] convertToCCPartitionGroup (List<PartitionGroup> partitionGroupBeans) {
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup[] partitionGroups = new
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup[partitionGroupBeans.size()];
+ org.apache.stratos.autoscaler.partition.PartitionGroup[] partitionGroups = new
+ org.apache.stratos.autoscaler.partition.PartitionGroup[partitionGroupBeans.size()];
for (int i = 0 ; i < partitionGroupBeans.size() ; i++) {
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup partitionGroup = new
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup();
+ org.apache.stratos.autoscaler.partition.PartitionGroup partitionGroup = new
+ org.apache.stratos.autoscaler.partition.PartitionGroup();
partitionGroup.setId(partitionGroupBeans.get(i).id);
partitionGroup.setPartitionAlgo(partitionGroupBeans.get(i).partitionAlgo);
@@ -449,7 +449,7 @@ public class PojoConverter {
return deploymentPolicyBean;
}
- public static PartitionGroup populatePartitionGroupPojo (org.apache.stratos.autoscaler.partition.xsd.PartitionGroup
+ public static PartitionGroup populatePartitionGroupPojo (org.apache.stratos.autoscaler.partition.PartitionGroup
partitionGroup) {
PartitionGroup partitionGroupBean = new PartitionGroup();
@@ -466,7 +466,7 @@ public class PojoConverter {
return partitionGroupBean;
}
- public static PartitionGroup [] populatePartitionGroupPojos (org.apache.stratos.autoscaler.partition.xsd.PartitionGroup[] partitionGroups) {
+ public static PartitionGroup [] populatePartitionGroupPojos (org.apache.stratos.autoscaler.partition.PartitionGroup[] partitionGroups) {
PartitionGroup[] partitionGroupsBeans;
if(partitionGroups == null) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93ee2368/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 9bb225a..6aa0ea9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
@@ -326,7 +326,7 @@ public class ServiceUtils {
public static PartitionGroup[] getPartitionGroups (String deploymentPolicyId)
throws RestAPIException{
- org.apache.stratos.autoscaler.partition.xsd.PartitionGroup [] partitionGroups = null;
+ org.apache.stratos.autoscaler.partition.PartitionGroup [] partitionGroups = null;
AutoscalerServiceClient autoscalerServiceClient = getAutoscalerServiceClient();
if (autoscalerServiceClient != null) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93ee2368/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 523dc3f..8d9094f 100644
--- a/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
+++ b/service-stubs/org.apache.stratos.autoscaler.service.stub/pom.xml
@@ -47,7 +47,7 @@
<configuration>
<tasks>
<java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
- <arg line="-uri src/main/resources/AutoScalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.exception,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.deployment.partition,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.pojo"/>
+ <arg line="-uri src/main/resources/AutoScalerService.wsdl -u -uw -o target/generated-code -p org.apache.stratos.autoscaler.stub -ns2p http://policy.deployment.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.deployment.policy,http://model.policy.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.policy.model,http://exception.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.exception,http://partition.deployment.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.deployment.partition,http://pojo.controller.cloud.stratos.apache.org/xsd=org.apache.stratos.cloud.controller.pojo,http://partition.autoscaler.stratos.apache.org/xsd=org.apache.stratos.autoscaler.partition"/>
<classpath refid="maven.dependency.classpath"/>
<classpath refid="maven.compile.classpath"/>
<classpath refid="maven.runtime.classpath"/>
@@ -93,6 +93,9 @@
org.apache.stratos.autoscaler.exception.*; version=${project.version},
org.apache.stratos.cloud.controller.deployment.*; version=${project.version}
</Export-Package>
+ <Private-Package>
+ org.apache.stratos.cloud.controller.deployment.partition.*; version=${project.version}
+ </Private-Package>
<Import-Package>
*;resolution:=optional
</Import-Package>