You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2013/11/07 07:34:10 UTC
git commit: Fixed compilation issue in the last patch provided by
Pradeep
Updated Branches:
refs/heads/master 83c69200d -> 293a86cf9
Fixed compilation issue in the last patch provided by Pradeep
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/293a86cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/293a86cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/293a86cf
Branch: refs/heads/master
Commit: 293a86cf9860f5488097a9194640ba9388dafdb6
Parents: 83c6920
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Nov 7 12:04:00 2013 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Nov 7 12:04:00 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/adc/mgt/dto/Cartridge.java | 74 --------------------
1 file changed, 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/293a86cf/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dto/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dto/Cartridge.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dto/Cartridge.java
index cd3d0fd..da09254 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dto/Cartridge.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/dto/Cartridge.java
@@ -199,78 +199,4 @@ public class Cartridge implements Comparable<Cartridge> {
}
return compare;
}
-
-
- @GET
- @Path("/cartridge/tenanted/list")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Cartridge[] getAvailableMultiTenantCartridges() throws ADCException {
- List<Cartridge> cartridges = ServiceUtils.getAvailableCartridges(null, true, getConfigContext());
- return cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]);
- }
-
- @GET
- @Path("/cartridge/list")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Cartridge[] getAvailableSingleTenantCartridges() throws ADCException {
- List<Cartridge> cartridges = ServiceUtils.getAvailableCartridges(null, false, getConfigContext());
- return cartridges.isEmpty() ? new Cartridge[0] : cartridges.toArray(new Cartridge[cartridges.size()]);
- }
-
- @GET
- @Path("/cartridge/list/subscribed")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public Cartridge[] getSubscribedCartridges() throws ADCException {
- List<Cartridge> cartridgeList = ServiceUtils.getSubscribedCartridges(null, getConfigContext());
- // Following is very important when working with axis2
- return cartridgeList.isEmpty() ? new Cartridge[0] : cartridgeList.toArray(new Cartridge[cartridgeList.size()]);
- }
-
- @POST
- @Path("/cartridge/subscribe")
- @Produces("application/json")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public SubscriptionInfo subscribe(CartridgeInfoBean cartridgeInfoBean) {
- try {
- return ServiceUtils.subscribe(cartridgeInfoBean.getCartridgeType(),
- cartridgeInfoBean.getAlias(),
- cartridgeInfoBean.getPolicy(),
- cartridgeInfoBean.getRepoURL(),
- cartridgeInfoBean.isPrivateRepo(),
- cartridgeInfoBean.getRepoUsername(),
- cartridgeInfoBean.getRepoPassword(),
- cartridgeInfoBean.getDataCartridgeType(),
- cartridgeInfoBean.getDataCartridgeAlias(),
- getConfigContext(),
- getUsername(),
- getTenantDomain());
- } catch (Exception exception) {
- log.error(exception);
- return null;
- }
- }
-
- @POST
- @Path("/cartridge/unsubscribe")
- @Consumes("application/json")
- @AuthorizationAction("/permission/protected/manage/monitor/tenants")
- public void unsubscribe(String alias){
- try {
- ServiceUtils.unsubscribe(alias,getTenantDomain());
- } catch (Exception exception) {
- log.error(exception);
- }
- }
-
-
-
-
-
}