Repository: stratos Updated Branches: refs/heads/master cfa63fb3a -> 283d21d95
commenting token generation due to bundle issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/283d21d9 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/283d21d9 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/283d21d9 Branch: refs/heads/master Commit: 283d21d95c122c25e84706c16f1279cd6b2e0366 Parents: cfa63fb Author: Udara Liyanage <[email protected]> Authored: Sun Dec 7 11:10:25 2014 +0530 Committer: Udara Liyanage <[email protected]> Committed: Sun Dec 7 11:17:00 2014 +0530 ---------------------------------------------------------------------- .../applications/parser/DefaultApplicationParser.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/283d21d9/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java index de9110f..3cb50a6 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java @@ -19,8 +19,6 @@ package org.apache.stratos.autoscaler.applications.parser; -import org.apache.amber.oauth2.common.exception.OAuthProblemException; -import org.apache.amber.oauth2.common.exception.OAuthSystemException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -32,9 +30,6 @@ import org.apache.stratos.autoscaler.applications.STClusterInformation; import org.apache.stratos.autoscaler.applications.payload.PayloadData; import org.apache.stratos.autoscaler.applications.pojo.*; import org.apache.stratos.autoscaler.client.CloudControllerClient; -import org.apache.stratos.autoscaler.client.IdentityApplicationManagementServiceClient; -import org.apache.stratos.autoscaler.client.oAuthAdminServiceClient; -import org.apache.stratos.autoscaler.exception.AutoScalerException; import org.apache.stratos.autoscaler.exception.application.ApplicationDefinitionException; import org.apache.stratos.autoscaler.exception.cartridge.CartridgeInformationException; import org.apache.stratos.autoscaler.pojo.ServiceGroup; @@ -46,12 +41,10 @@ import org.apache.stratos.messaging.domain.applications.Application; import org.apache.stratos.messaging.domain.applications.ClusterDataHolder; import org.apache.stratos.messaging.domain.applications.DependencyOrder; import org.apache.stratos.messaging.domain.applications.Group; -import org.wso2.carbon.identity.oauth.stub.OAuthAdminServiceException; import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import java.rmi.RemoteException; import java.util.*; /** @@ -800,6 +793,7 @@ public class DefaultApplicationParser implements ApplicationParser { return new ApplicationClusterContext(cartridgeInfo.getType(), clusterId, hostname, textPayload, deploymentPolicy, isLB); } + /* public String createToken(String appid) throws AutoScalerException { String token = null; String ouathAppName = appid + Math.random(); @@ -826,6 +820,7 @@ public class DefaultApplicationParser implements ApplicationParser { return token; } + */ private CartridgeInfo getCartridge (String cartridgeType) throws ApplicationDefinitionException { try {
