You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/07/17 13:42:53 UTC
[3/3] git commit: Merge branch '4.0.0-grouping' of
https://git-wip-us.apache.org/repos/asf/stratos into grouping
Merge branch '4.0.0-grouping' of https://git-wip-us.apache.org/repos/asf/stratos into grouping
Conflicts:
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/CompositeApplicationManager.java
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java
components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/subscription/CompositeAppSubscription.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/StratosAdmin.java
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/11ff7242
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/11ff7242
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/11ff7242
Branch: refs/heads/4.0.0-grouping
Commit: 11ff72422cb1c77b066b83728240aa761c24d0d1
Parents: 60f2359 8499eda
Author: Udara Liyanage <ud...@wso2.com>
Authored: Thu Jul 17 17:12:14 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Thu Jul 17 17:12:14 2014 +0530
----------------------------------------------------------------------
.../CompositeApplicationManager.java | 338 +++++++++++++------
.../DefaultCompositeApplicationParser.java | 12 +-
.../application/utils/ApplicationUtils.java | 14 +
.../CompositeAppSubscriptionException.java | 47 +++
.../exception/GroupSubscriptionException.java | 47 +++
.../manager/CartridgeSubscriptionManager.java | 52 ++-
.../manager/persistence/PersistenceManager.java | 32 +-
.../RegistryBasedPersistenceManager.java | 259 ++------------
.../DataInsertionAndRetrievalManager.java | 107 ++----
.../subscription/CompositeAppSubscription.java | 54 ++-
.../manager/subscription/GroupSubscription.java | 83 +++++
.../rest/endpoint/services/ServiceUtils.java | 25 --
12 files changed, 590 insertions(+), 480 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/11ff7242/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
index 9bfc864,fdd0138..a2b36bd
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/composite/application/parser/DefaultCompositeApplicationParser.java
@@@ -116,8 -117,8 +117,8 @@@ public class DefaultCompositeApplicatio
}
// check validity of group alias
- if (group.getAlias() == null || group.getAlias().isEmpty()) {
- throw new CompositeApplicationDefinitionException("Invalid Group alias specified");
- if (group.getAlias() == null || group.getAlias().isEmpty() || ApplicationUtils.isAliasValid(group.getAlias())) {
++ if (group.getAlias() == null || group.getAlias().isEmpty() || !ApplicationUtils.isAliasValid(group.getAlias())) {
+ throw new CompositeApplicationDefinitionException("Invalid Group alias specified: [ " + group.getAlias() + " ]");
}
// check if a group is already defined under the same alias
@@@ -148,8 -149,9 +149,9 @@@
for (SubscribableInfo subscribableInfo : compositeAppDefinition.getSubscribableInfo()) {
- if (subscribableInfo.getAlias() == null || subscribableInfo.getAlias().isEmpty()) {
- throw new CompositeApplicationDefinitionException("Invalid alias specified for Subscribable Information Obj");
+ if (subscribableInfo.getAlias() == null || subscribableInfo.getAlias().isEmpty() ||
- ApplicationUtils.isAliasValid(subscribableInfo.getAlias())) {
++ !ApplicationUtils.isAliasValid(subscribableInfo.getAlias())) {
+ throw new CompositeApplicationDefinitionException("Invalid alias specified for Subscribable Information Obj: [ " + subscribableInfo.getAlias() + " ]");
}
// check if a group is already defined under the same alias
http://git-wip-us.apache.org/repos/asf/stratos/blob/11ff7242/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/services/ServiceUtils.java
index 804e4b5,e02ea11..9b7fff8
--- 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
@@@ -308,32 -314,36 +308,7 @@@ public class ServiceUtils
}
log.info(String.format("[type] %s", configCompositeApplicationAlias));
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully un-deployed application with alias " + configCompositeApplicationAlias);
- return stratosAdminResponse;
}
--
--
- static StratosAdminResponse unDeployApplicationOld(String configCompositeApplicationAlias, ConfigurationContext ctxt,
- String userName, String tenantDomain) throws RestAPIException {
-
- log.info("Starting to undeploy a composite application " + configCompositeApplicationAlias);
-
- CompositeApplicationManager manager = new CompositeApplicationManager();
-
- try {
- manager.unDeployCompositeApplication(configCompositeApplicationAlias);
- } catch (ADCException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- String message = e.getMessage();
- log.error(message, e);
- throw new RestAPIException(message, e);
- }
-
- log.info("l [type] " + configCompositeApplicationAlias);
-
- StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
- stratosAdminResponse.setMessage("Successfully un-deployed application with alias " + configCompositeApplicationAlias);
- return stratosAdminResponse;
- }
-// static StratosAdminResponse unDeployApplicationOld(String configCompositeApplicationAlias, ConfigurationContext ctxt,
-// String userName, String tenantDomain) throws RestAPIException {
-//
-// log.info("Starting to undeploy a composite application " + configCompositeApplicationAlias);
-//
-// CompositeApplicationManager manager = new CompositeApplicationManager();
-//
-// try {
-// manager.unDeployCompositeApplication(configCompositeApplicationAlias);
-// } catch (ADCException e) {
-// // TODO Auto-generated catch block
-// e.printStackTrace();
-// String message = e.getMessage();
-// log.error(message, e);
-// throw new RestAPIException(message, e);
-// }
-//
-// log.info("l [type] " + configCompositeApplicationAlias);
-//
-// StratosAdminResponse stratosAdminResponse = new StratosAdminResponse();
-// stratosAdminResponse.setMessage("Successfully un-deployed application with alias " + configCompositeApplicationAlias);
-// return stratosAdminResponse;
-// }
@SuppressWarnings("unused")
private static DeploymentPolicy[] intersection(