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 2014/10/30 12:47:16 UTC
[3/3] git commit: Updating CC & AS wsdls and fixing compilation
errors in SM
Updating CC & AS wsdls and fixing compilation errors in SM
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/be580189
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/be580189
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/be580189
Branch: refs/heads/docker-grouping-merge
Commit: be580189e419253bd869b9b66d5ebbdfeb9a39d7
Parents: 4a475b6
Author: lasinducharith <la...@gmail.com>
Authored: Thu Oct 30 17:15:59 2014 +0530
Committer: lasinducharith <la...@gmail.com>
Committed: Thu Oct 30 17:15:59 2014 +0530
----------------------------------------------------------------------
.../client/CloudControllerServiceClient.java | 2 +-
.../manager/CartridgeSubscriptionManager.java | 18 +-
.../src/main/resources/AutoScalerService.wsdl | 1562 +++++++++---------
.../main/resources/CloudControllerService.wsdl | 1420 +++++++++++-----
4 files changed, 1759 insertions(+), 1243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/be580189/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
index 75f48d8..5c84a7c 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/client/CloudControllerServiceClient.java
@@ -24,7 +24,7 @@ import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.cloud.controller.stub.pojo.application.ApplicationContext;
+import org.apache.stratos.cloud.controller.pojo.application.xsd.ApplicationContext;
import org.apache.stratos.cloud.controller.stub.*;
import org.apache.stratos.cloud.controller.stub.pojo.*;
import org.apache.stratos.manager.internal.DataHolder;
http://git-wip-us.apache.org/repos/asf/stratos/blob/be580189/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
index eedd1e5..7d59bc9 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
@@ -254,17 +254,7 @@ public class CartridgeSubscriptionManager {
throw new ADCException(e);
}
}
-
- public SubscriptionInfo subscribeToCartridgeWithProperties(SubscriptionData subscriptionData) throws ADCException,
- InvalidCartridgeAliasException,
- DuplicateCartridgeAliasException,
- PolicyException,
- UnregisteredCartridgeException,
- RepositoryRequiredException,
- RepositoryCredentialsRequiredException,
- RepositoryTransportException,
- AlreadySubscribedException,
- InvalidRepositoryException {
+
/**
*
* @param subscriptionData
@@ -662,7 +652,7 @@ public class CartridgeSubscriptionManager {
}
}
- public boolean isSubscriptionDomainValid(String domainName) throws ADCException {
+ public static boolean isSubscriptionDomainValid(String domainName) throws ADCException {
try {
if(log.isDebugEnabled()) {
log.debug(String.format("Validating domain: %s", domainName));
@@ -712,7 +702,7 @@ public class CartridgeSubscriptionManager {
}
}
- public CartridgeSubscription getCartridgeSubscription (int tenantId, String subscriptionAlias) {
+ public static CartridgeSubscription getCartridgeSubscription (int tenantId, String subscriptionAlias) {
return new DataInsertionAndRetrievalManager().getCartridgeSubscription(tenantId, subscriptionAlias);
}
@@ -777,7 +767,7 @@ public class CartridgeSubscriptionManager {
}
}
- private Properties getPersistenceMappingProperties (PersistenceContext persistenceCtxt, CartridgeInfo cartridgeInfo) throws ADCException {
+ private static Properties getPersistenceMappingProperties (PersistenceContext persistenceCtxt, CartridgeInfo cartridgeInfo) throws ADCException {
if (!cartridgeInfo.isPersistenceSpecified()) {
// Persistence Mapping not supported in the cartridge definition - error