You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/11 09:31:54 UTC
[02/21] git commit: RESTful list command
RESTful list command
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/32c67e3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32c67e3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32c67e3e
Branch: refs/heads/master
Commit: 32c67e3e8d2c84442fd6dcc16d82ffabe77f4e04
Parents: 5fc89c3
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Dec 4 12:04:36 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 4 12:04:36 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/CommandLineService.java | 16 +++----
.../stratos/cli/RestCommandLineService.java | 47 ++++++++++++++++++--
2 files changed, 52 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/32c67e3e/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
index 04aec45..d7dcc5a 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
@@ -234,7 +234,7 @@ public class CommandLineService {
if (logger.isDebugEnabled()) {
logger.debug("No multi-tenant cartridges available");
}
- System.out.println("There are no multi-tenant cartridges available");
+ //System.out.println("There are no multi-tenant cartridges available");
}
RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() {
@@ -249,9 +249,9 @@ public class CommandLineService {
}
};
- System.out.println("Available Multi-Tenant Cartridges:");
- CommandLineUtils.printTable(multiTenantCatridges, cartridgeMapper, "Type", "Name", "Version");
- System.out.println();
+ //System.out.println("Available Multi-Tenant Cartridges:");
+ //CommandLineUtils.printTable(multiTenantCatridges, cartridgeMapper, "Type", "Name", "Version");
+ //System.out.println();
Cartridge[] singleTenantCatridges = stub.getAvailableCartridges(false);
@@ -259,12 +259,12 @@ public class CommandLineService {
if (logger.isDebugEnabled()) {
logger.debug("No single-tenant cartridges available");
}
- System.out.println("There are no single-tenant cartridges available");
+ //System.out.println("There are no single-tenant cartridges available");
}
- System.out.println("Available Single-Tenant Cartridges:");
- CommandLineUtils.printTable(singleTenantCatridges, cartridgeMapper, "Type", "Name", "Version");
- System.out.println();
+ //System.out.println("Available Single-Tenant Cartridges:");
+ //CommandLineUtils.printTable(singleTenantCatridges, cartridgeMapper, "Type", "Name", "Version");
+ //System.out.println();
} catch (ApplicationManagementServiceADCExceptionException e) {
handleException("cannot.list.available.cartridges", e);
} catch (RemoteException e) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/32c67e3e/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 8017ad0..c55be5a 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -62,7 +62,23 @@ public class RestCommandLineService {
System.out.println("Object is null");
}
+ CartridgeList multiTelentCartridgeList = new CartridgeList();
+ CartridgeList singleTeneCartridgetList = new CartridgeList();
+ ArrayList<Cartridge> multiTenetCartridge = new ArrayList<Cartridge>();
+ ArrayList<Cartridge> singleTentCartridge = new ArrayList<Cartridge>();
+
+ for (Cartridge cartridge : cartridgeList.getCartridge()) {
+ if (cartridge.isMultiTenant()) {
+ multiTenetCartridge.add(cartridge);
+ }
+ else {
+ singleTentCartridge.add(cartridge);
+ }
+ }
+
+ multiTelentCartridgeList.setCartridge(multiTenetCartridge);
+ singleTeneCartridgetList.setCartridge(singleTentCartridge);
RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() {
@@ -76,10 +92,35 @@ public class RestCommandLineService {
}
};
- Cartridge[] cartridges = new Cartridge[cartridgeList.getCartridge().size()];
- cartridges = cartridgeList.getCartridge().toArray(cartridges);
+ if (multiTenetCartridge.size() == 0) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("No multi-tenant cartridges available");
+ }
+ System.out.println("There are no multi-tenant cartridges available");
+ }
+ else {
+ Cartridge[] cartridges = new Cartridge[multiTelentCartridgeList.getCartridge().size()];
+ cartridges = multiTelentCartridgeList.getCartridge().toArray(cartridges);
- CommandLineUtils.printTable(cartridges, cartridgeMapper, "Type", "Name", "Version");
+ System.out.println("Available Multi-Tenant Cartridges:");
+ CommandLineUtils.printTable(cartridges, cartridgeMapper, "Type", "Name", "Version");
+ System.out.println();
+ }
+
+ if (singleTentCartridge.size() == 0) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("No single-tenant cartridges available");
+ }
+ System.out.println("There are no single-tenant cartridges available");
+ }
+ else {
+ Cartridge[] cartridges1 = new Cartridge[singleTeneCartridgetList.getCartridge().size()];
+ cartridges1 = singleTeneCartridgetList.getCartridge().toArray(cartridges1 );
+
+ System.out.println("Available Single-Tenant Cartridges:");
+ CommandLineUtils.printTable(cartridges1, cartridgeMapper, "Type", "Name", "Version");
+ System.out.println();
+ }
} catch (Exception e) {
e.printStackTrace();