Refactor code according to org.apache.stratos.adc.mgt.stub changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/990796bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/990796bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/990796bc Branch: refs/heads/master Commit: 990796bc3fd0985e7c18a151a69d01f04c7ed7a0 Parents: d167bd5 Author: Manula Thantriwatte <[email protected]> Authored: Tue Dec 10 16:13:02 2013 +0530 Committer: Manula Thantriwatte <[email protected]> Committed: Tue Dec 10 16:13:02 2013 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/mgt/ui/CartridgeAdminClient.java | 8 ++++---- .../resources/web/cartridge-mgt/available_cartridges.jsp | 4 ++-- .../resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp | 2 +- .../web/cartridge-mgt/remove_domain_ajaxprocessor.jsp | 2 +- .../src/main/resources/web/cartridge-mgt/subscribe.jsp | 2 +- .../resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp | 4 ++-- .../resources/web/cartridge-mgt/subscribed_cartridges.jsp | 4 ++-- .../cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp | 4 ++-- .../resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp | 2 +- .../resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp | 2 +- .../web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp | 2 +- .../java/org/apache/stratos/cli/RestCommandLineService.java | 2 -- .../stratos/cli/commands/CartridgeDeploymentCommand.java | 7 ++----- .../pom.xml | 2 +- 14 files changed, 21 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/java/org/apache/stratos/cartridge/mgt/ui/CartridgeAdminClient.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/java/org/apache/stratos/cartridge/mgt/ui/CartridgeAdminClient.java b/components/org.apache.stratos.cartridge.mgt.ui/src/main/java/org/apache/stratos/cartridge/mgt/ui/CartridgeAdminClient.java index 6d21e25..7a9abd1 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/java/org/apache/stratos/cartridge/mgt/ui/CartridgeAdminClient.java +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/java/org/apache/stratos/cartridge/mgt/ui/CartridgeAdminClient.java @@ -30,10 +30,10 @@ import org.apache.axis2.client.ServiceClient; import org.apache.axis2.context.ConfigurationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.stratos.adc.mgt.dto.xsd.CartridgeWrapper; -import org.apache.stratos.adc.mgt.dto.xsd.PolicyDefinition; -import org.apache.stratos.adc.mgt.dto.xsd.RepositoryInformation; -import org.apache.stratos.adc.mgt.dto.xsd.SubscriptionInfo; +import org.apache.stratos.adc.mgt.dto.CartridgeWrapper; +import org.apache.stratos.adc.mgt.dto.PolicyDefinition; +import org.apache.stratos.adc.mgt.dto.RepositoryInformation; +import org.apache.stratos.adc.mgt.dto.SubscriptionInfo; import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceADCExceptionException; import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceAlreadySubscribedExceptionException; import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceDomainMappingExistsExceptionException; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/available_cartridges.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/available_cartridges.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/available_cartridges.jsp index 188fca1..d250d57 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/available_cartridges.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/available_cartridges.jsp @@ -25,8 +25,8 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.CartridgeWrapper"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.CartridgeWrapper"%> <%@ page import="org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceADCExceptionException"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp index 92f6f04..f56262f 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/map_domain_ajaxprocessor.jsp @@ -25,7 +25,7 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> <jsp:include page="../dialog/display_messages.jsp" /> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/remove_domain_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/remove_domain_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/remove_domain_ajaxprocessor.jsp index f1d9829..f6fc37b 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/remove_domain_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/remove_domain_ajaxprocessor.jsp @@ -25,7 +25,7 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> <jsp:include page="../dialog/display_messages.jsp" /> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe.jsp index 7e4b377..286163b 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe.jsp @@ -24,7 +24,7 @@ <%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %> <%@ page import="org.wso2.carbon.utils.ServerConstants" %> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient" %> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.PolicyDefinition" %> +<%@ page import="org.apache.stratos.adc.mgt.dto.PolicyDefinition" %> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon" %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.ResourceBundle" %> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp index 861e5d1..b6809d1 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribe_ajaxprocessor.jsp @@ -25,8 +25,8 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants" %> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient" %> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon" %> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge" %> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.SubscriptionInfo" %> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge" %> +<%@ page import="org.apache.stratos.adc.mgt.dto.SubscriptionInfo" %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.ResourceBundle" %> <%@ page import="java.util.Map" %> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges.jsp index 38b17db..b7aeea7 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges.jsp @@ -25,8 +25,8 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.CartridgeWrapper"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.CartridgeWrapper"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> <%@ page import="java.util.ArrayList"%> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp index bfd69b2..0462f8e 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp @@ -25,8 +25,8 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.CartridgeWrapper"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.CartridgeWrapper"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> <%@ page import="java.util.ArrayList"%> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp index f4a8256..0a3434b 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp @@ -25,7 +25,7 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants"%> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient"%> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon"%> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge"%> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge"%> <%@ page import="java.text.SimpleDateFormat"%> <%@ page import="java.util.ResourceBundle"%> <jsp:include page="../dialog/display_messages.jsp" /> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp index 59f00c6..a26cce0 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp @@ -25,7 +25,7 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants" %> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient" %> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon" %> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.RepositoryInformation" %> +<%@ page import="org.apache.stratos.adc.mgt.dto.RepositoryInformation" %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.ResourceBundle" %> <%@ page import="java.util.Map" %> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp index 432c5d1..1a4f646 100644 --- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp +++ b/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp @@ -25,7 +25,7 @@ <%@ page import="org.wso2.carbon.utils.ServerConstants" %> <%@ page import="org.apache.stratos.cartridge.mgt.ui.CartridgeAdminClient" %> <%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"; prefix="carbon" %> -<%@ page import="org.apache.stratos.adc.mgt.dto.xsd.Cartridge" %> +<%@ page import="org.apache.stratos.adc.mgt.dto.Cartridge" %> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.ResourceBundle" %> <jsp:include page="../dialog/display_messages.jsp"/> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/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 5eb4b15..81c0c4e 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 @@ -182,7 +182,6 @@ public class RestCommandLineService { RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() { - @Override public String[] getData(Cartridge cartridge) { String[] data = new String[3]; data[0] = cartridge.getCartridgeType(); @@ -253,7 +252,6 @@ public class RestCommandLineService { RowMapper<Cartridge> cartridgeMapper = new RowMapper<Cartridge>() { - @Override public String[] getData(Cartridge cartridge) { String[] data = full ? new String[9] : new String[7]; data[0] = cartridge.getCartridgeType(); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java index 2f8c454..5356c7f 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgeDeploymentCommand.java @@ -53,22 +53,18 @@ public class CartridgeDeploymentCommand implements Command<StratosCommandContext return options; } - @Override public String getName() { return CliConstants.CARTRIDGE_DEPLOYMENT; } - @Override public String getDescription() { return "Add new cartridge deployment"; } - @Override public String getArgumentSyntax() { return null; } - @Override public int execute(StratosCommandContext context, String[] args) throws CommandException { if (logger.isDebugEnabled()) { logger.debug("Executing {} command...", getName()); @@ -111,7 +107,8 @@ public class CartridgeDeploymentCommand implements Command<StratosCommandContext System.out.println(e.getMessage()); return CliConstants.BAD_ARGS_CODE; } catch (IOException e) { - e.printStackTrace(); + //e.printStackTrace(); + System.out.println("Invalid resource path"); return CliConstants.BAD_ARGS_CODE; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/990796bc/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml ---------------------------------------------------------------------- diff --git a/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml b/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml index d3de32f..765e2b9 100644 --- a/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml +++ b/service-stubs/org.apache.stratos.adc.reponotification.service.stub/pom.xml @@ -96,7 +96,7 @@ <Export-Package> org.apache.stratos.adc.reponotification.stub.*; version="${project.version}", org.apache.stratos.adc.mgt.service.*; version="${project.version}", - org.apache.stratos.adc.mgt.dto.xsd.*; version="${project.version}", + org.apache.stratos.adc.mgt.dto.*; version="${project.version}", org.apache.stratos.adc.mgt.exception.xsd.*; version="${project.version}" </Export-Package> <Import-Package>
