You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/09/24 13:31:33 UTC
[07/12] Removing unused cartridge.mgt.ui component,
feature and dependencies
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/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
deleted file mode 100644
index 3bbd110..0000000
--- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/subscribed_cartridges_ajaxprocessor.jsp
+++ /dev/null
@@ -1,281 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~
- --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ 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.manager.dto.Cartridge"%>
-<%@ page import="org.apache.stratos.manager.dto.CartridgeWrapper"%>
-<%@ page import="java.text.SimpleDateFormat"%>
-<%@ page import="java.util.ResourceBundle"%>
-<%@ page import="java.util.ArrayList"%>
-
-<jsp:include page="../dialog/display_messages.jsp" />
-
-<%
- response.setHeader("Cache-Control", "no-cache");
-
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext =
- (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- CartridgeAdminClient client;
- Cartridge[] cartridges = null;
-
- int numberOfPages = 0;
- String pageNumber = request.getParameter("pageNumber");
- if (pageNumber == null) {
- pageNumber = "0";
- }
- int pageNumberInt = 0;
- try {
- pageNumberInt = Integer.parseInt(pageNumber);
- } catch (NumberFormatException ignored) {
- }
-
- String cartridgeSearchString = request.getParameter("cartridgeSearchString");
- if (cartridgeSearchString == null) {
- cartridgeSearchString = "";
- }
-
- try {
- client = new CartridgeAdminClient(cookie, backendServerURL, configContext, request.getLocale());
- CartridgeWrapper cartridgeWrapper = client.getPagedSubscribedCartridges(cartridgeSearchString, pageNumberInt);
- if (cartridgeWrapper != null) {
- numberOfPages = cartridgeWrapper.getNumberOfPages();
- cartridges = cartridgeWrapper.getCartridges();
- }
- } catch (Exception e) {
- response.setStatus(500);
- CarbonUIMessage uiMsg = new CarbonUIMessage(CarbonUIMessage.ERROR, e.getMessage(), e);
- session.setAttribute(CarbonUIMessage.ID, uiMsg);
-%>
-<jsp:include page="../admin/error.jsp" />
-<%
- return;
- }
-%>
-
-<fmt:bundle basename="org.apache.stratos.cartridge.mgt.ui.i18n.Resources">
- <div>
- <%
- if (cartridges != null) {
- String parameters = "cartridgeSearchString=" + cartridgeSearchString;
- %>
-
- <carbon:paginator pageNumber="<%=pageNumberInt%>" numberOfPages="<%=numberOfPages%>" page="subscribed_cartridges.jsp"
- pageNumberParameterName="pageNumber" resourceBundle="org.apache.stratos.cartridge.mgt.ui.i18n.Resources" prevKey="prev"
- nextKey="next" parameters="<%=parameters%>" />
- <p> </p>
-
- <form id="frmSubC" name="cartridgesForm" method="post">
- <input type="hidden" name="pageNumber" value="<%=pageNumber%>" />
- <table id="cartridgesTable" class="styledLeft" style="width: 100%">
- <thead>
- <tr>
- <th style="width: 10%"><fmt:message key="cartridge.display.name" /></th>
- <th style="width: 70px"><fmt:message key="cartridge.version" /></th>
- <th style="width: 125px"><fmt:message key="cartridge.tenancymodel" /></th>
- <th style="width: 10%"><fmt:message key="alias" /></th>
- <th style="width: 5%"><fmt:message key="status" /></th>
- <th style="text-align: right; padding-right: 5px; width: 125px;"><fmt:message key="instance.count" /></th>
- <th><fmt:message key="url" /></th>
- <th style="width: 12%"><fmt:message key="repo.url" /></th>
- <th style="width: 8%"><fmt:message key="action" /></th>
- </tr>
- </thead>
- <tbody>
-
- <%
- int id = 1; // To generate ID
-
- for (Cartridge cartridge : cartridges) {
-
- String popupID = "cartridge_popup_" + id;
- String rowStyleClass = ((id & 1) == 0) ? "tableEvenRow" : "tableOddRow";
-
- // Increment ID
- id++;
-
- String[] accessURLs = cartridge.getAccessURLs();
- StringBuilder urlBuilder = new StringBuilder();
- if (accessURLs != null) {
- for (int i = 0; i < accessURLs.length; i++) {
- String url = accessURLs[i];
- if (url != null) {
- if (i > 0) {
- urlBuilder.append("<br />");
- }
- urlBuilder.append("<a href=\"").append(url).append("\" target=\"_blank\">").append(url).append("</a>");
- }
- }
- }
-
- String displayName = (cartridge.getDisplayName() != null ? cartridge.getDisplayName() : "");
- String version = (cartridge.getVersion() != null ? cartridge.getVersion() : "");
- String description = (cartridge.getDescription() != null ? cartridge.getDescription() : "");
- String alias = (cartridge.getCartridgeAlias() != null ? cartridge.getCartridgeAlias() : "");
- String status = (cartridge.getStatus() != null ? cartridge.getStatus() : "");
- int activeInstances = cartridge.getActiveInstances();
- String instances = cartridge.getMultiTenant() ? "N/A" : String.valueOf(activeInstances);
- String accessURL = urlBuilder.toString();
- String repoURL = (cartridge.getRepoURL() != null ? cartridge.getRepoURL() : "");
- String ip = (cartridge.getIp() != null ? cartridge.getIp() : "");
- String dbUsername = (cartridge.getDbUserName() != null ? cartridge.getDbUserName() : "");
- String password = (cartridge.getPassword() != null ? cartridge.getPassword() : "");
- String mappedDomain = (cartridge.getMappedDomain() != null ? cartridge.getMappedDomain() : "");
- String policy = (cartridge.getPolicyDescription() != null ? cartridge.getPolicyDescription() : "");
- String tenancyModel = cartridge.getMultiTenant() ? "Multi-Tenant" : "Single-Tenant";
-
- if (repoURL.startsWith("http")) {
- StringBuilder repoURLBuilder = new StringBuilder();
- repoURL = repoURLBuilder.append("<a href=\"").append(repoURL).append("\" target=\"_blank\">").append(repoURL).append("</a>").toString();
- }
- %>
-
- <tr class="<%=rowStyleClass%>">
- <td><%=displayName%></td>
- <td><%=version%></td>
- <td><%=tenancyModel%></td>
- <td><a onclick="showCartridgeInfo('<%=popupID%>', '<%=alias%>')" style="background-image:url(../admin/images/information.gif);" class="icon-link"><%=alias%></a></td>
- <td><span <%if (!"ACTIVE".equalsIgnoreCase(status)) {%>
- style="background-image: url(images/ajax-loading.gif); background-repeat: no-repeat; background-position: left center; padding-left: 22px;"
- <%}%>><%=status%></span></td>
- <td style="text-align: right;"><%=instances%></td>
- <td><%=accessURL%></td>
- <td><%=repoURL%></td>
- <td><a onclick="unsubscribeCartridge('<%=alias%>');" style="background-image:url(images/unsubscribe.png);" class="icon-link">
- <fmt:message key="unsubscribe"/></a>
- <% if (mappedDomain.length() == 0) { %>
- <a href="./map_domain.jsp?cartridge_alias=<%=alias%>&domain=<%=mappedDomain%>" class="icon-link">
- <fmt:message key="mapdomain"/></a>
- <% } %>
- <% if (repoURL.length() > 0) { %>
- <a onclick="syncRepo('<%=alias%>');" class="icon-link">
- <fmt:message key="syncrepo"/></a>
- <% } %>
- <% if (mappedDomain.length() > 0) { %>
- <a onclick="removeDomain('<%=alias%>');" class="icon-link">
- <fmt:message key="removedomain"/></a>
- <% } %>
- <div id="<%=popupID%>" style="display: none">
- <table class="popupTable" style="width: 100%">
- <tbody>
- <tr class="tableOddRow">
- <td style="width: 40%"><fmt:message key="cartridge.display.name" /></td>
- <td><%=displayName%></td>
- </tr>
- <tr class="tableEvenRow">
- <td style="width: 40%"><fmt:message key="cartridge.version" /></td>
- <td><%=version%></td>
- </tr>
- <tr class="tableOddRow">
- <td style="width: 40%"><fmt:message key="cartridge.description" /></td>
- <td><%=description%></td>
- </tr>
- <tr class="tableEvenRow">
- <td style="width: 40%"><fmt:message key="cartridge.tenancymodel" /></td>
- <td><%=tenancyModel%></td>
- </tr>
- <tr class="tableOddRow">
- <td style="width: 40%"><fmt:message key="alias" /></td>
- <td><%=alias%></td>
- </tr>
- <tr class="tableEvenRow">
- <td style="width: 40%"><fmt:message key="status" /></td>
- <td><%=status%></td>
- </tr>
- <tr class="tableOddRow">
- <td style="width: 40%"><fmt:message key="instance.count" /></td>
- <td><%=instances%></td>
- </tr>
- <tr class="tableEvenRow">
- <td style="width: 40%"><fmt:message key="url" /></td>
- <td><%=accessURL%></td>
- </tr>
- <%
- // Assign style class according to row
- int popupRowId = 0;
- %>
- <% if (policy.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="policy" /></td>
- <td><%=policy%></td>
- </tr>
- <% } %>
- <% if (repoURL.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="repo.url" /></td>
- <td><%=repoURL%></td>
- </tr>
- <% } %>
- <% if (ip.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="ip" /></td>
- <td><%=ip%></td>
- </tr>
- <% } %>
- <% if (dbUsername.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="username" /></td>
- <td><%=dbUsername%></td>
- </tr>
- <% } %>
- <% if (password.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="password" /></td>
- <td><%=password%></td>
- </tr>
- <% } %>
- <% if (mappedDomain.length() > 0) { %>
- <tr class="<%=(((++popupRowId & 1) == 0) ? "tableEvenRow" : "tableOddRow")%>">
- <td style="width: 40%"><fmt:message key="mappeddomain" /></td>
- <td><%=mappedDomain%></td>
- </tr>
- <% } %>
- </tbody>
- </table>
- </div>
- </td>
- </tr>
- <%
- }
- %>
- </tbody>
- </table>
- </form>
- <p> </p>
- <carbon:paginator pageNumber="<%=pageNumberInt%>" numberOfPages="<%=numberOfPages%>" page="subscribed_cartridges.jsp"
- pageNumberParameterName="pageNumber" resourceBundle="org.apache.stratos.cartridge.mgt.ui.i18n.Resources" prevKey="prev"
- nextKey="next" parameters="<%=parameters%>" />
- <%
- } else {
- %>
- <b><fmt:message key="no.cartridges.found" /></b>
- <%
- }
- %>
- </div>
-</fmt:bundle>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/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
deleted file mode 100644
index 41486e1..0000000
--- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/sync_repo_ajaxprocessor.jsp
+++ /dev/null
@@ -1,62 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~
- --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page import="org.apache.axis2.context.ConfigurationContext"%>
-<%@ page import="org.wso2.carbon.CarbonConstants"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage"%>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil"%>
-<%@ 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.manager.dto.Cartridge"%>
-<%@ page import="java.text.SimpleDateFormat"%>
-<%@ page import="java.util.ResourceBundle"%>
-<jsp:include page="../dialog/display_messages.jsp" />
-
-
-<%
- response.setHeader("Cache-Control", "no-cache");
-
- ResourceBundle bundle = ResourceBundle.getBundle(CartridgeAdminClient.BUNDLE, request.getLocale());
-
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext = (ConfigurationContext) config.getServletContext().getAttribute(
- CarbonConstants.CONFIGURATION_CONTEXT);
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- CartridgeAdminClient client;
-
- String cartridgeAlias = request.getParameter("cartridge_alias");
- try {
- client = new CartridgeAdminClient(cookie, backendServerURL, configContext, request.getLocale());
- client.synchronizeRepository(cartridgeAlias);
- //CarbonUIMessage.sendCarbonUIMessage("Initiated repository synchronization", CarbonUIMessage.INFO, request);
- String message = "Initiated repository synchronization";
-%>
-<span id="responseMsg"><%=message%></span>
-<%
- } catch (Exception e) {
- //CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request);
- response.setStatus(500);
-%>
-<span id="responseMsg"><%=e.getMessage()%></span>
-<%
- }
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/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
deleted file mode 100644
index 8ffc4a2..0000000
--- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/test_git_ajaxprocessor.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~
- --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ 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.manager.dto.RepositoryInformation" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.ResourceBundle" %>
-<%@ page import="java.util.Map" %>
-<jsp:include page="../dialog/display_messages.jsp"/>
-
-
-<%
- response.setHeader("Cache-Control", "no-cache");
-
- ResourceBundle bundle = ResourceBundle
- .getBundle(CartridgeAdminClient.BUNDLE, request.getLocale());
-
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext =
- (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- CartridgeAdminClient client;
- String repoUrl = "";
- String repoUserName = "";
- String repoPassword = "";
- String repoType = null;
-
- repoUrl = request.getParameter("repo_url");
- repoUserName = request.getParameter("repo_username");
- repoPassword = request.getParameter("repo_password");
- repoType = request.getParameter("repoType");
- try{
- client = new CartridgeAdminClient(cookie, backendServerURL, configContext, request.getLocale());
- RepositoryInformation repositoryInformation = client.testRepositoryConnection(repoUrl, repoUserName, repoPassword, "private".equals(repoType));
- String message = "";
- if (repositoryInformation != null) {
- message = "Successfully connected to the repository: " + repositoryInformation.getRepoURL();
- }
-%>
-<span id="responseMsg"><%=message%></span>
-<%
- } catch (Exception e) {
- response.setStatus(500);
-%>
-<span id="responseMsg"><%=e.getMessage()%></span>
-<%
- }
-%>
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/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
deleted file mode 100644
index 2bb001f..0000000
--- a/components/org.apache.stratos.cartridge.mgt.ui/src/main/resources/web/cartridge-mgt/unsubscribe_ajaxprocessor.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~
- --%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ 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.manager.dto.Cartridge" %>
-<%@ page import="java.text.SimpleDateFormat" %>
-<%@ page import="java.util.ResourceBundle" %>
-<jsp:include page="../dialog/display_messages.jsp"/>
-
-
-<%
- response.setHeader("Cache-Control", "no-cache");
-
- ResourceBundle bundle = ResourceBundle
- .getBundle(CartridgeAdminClient.BUNDLE, request.getLocale());
-
- String backendServerURL = CarbonUIUtil.getServerURL(config.getServletContext(), session);
- ConfigurationContext configContext =
- (ConfigurationContext) config.getServletContext().getAttribute(CarbonConstants.CONFIGURATION_CONTEXT);
-
- String cookie = (String) session.getAttribute(ServerConstants.ADMIN_SERVICE_COOKIE);
- CartridgeAdminClient client;
-
- String cartridgeAlias = request.getParameter("cartridge_alias");
-
- try{
- client= new CartridgeAdminClient(cookie, backendServerURL, configContext,request.getLocale());
- client.unsubscribe(cartridgeAlias);
- //CarbonUIMessage.sendCarbonUIMessage("Successfully unsubscribed " ,
- // CarbonUIMessage.INFO, request);
- String message = "Successfully unsubscribed";
-%>
-<span id="responseMsg"><%=message%></span>
-<%
- }catch (Exception e) {
- response.setStatus(500);
- //CarbonUIMessage uiMsg = new CarbonUIMessage(CarbonUIMessage.ERROR, e.getMessage(), e);
- //session.setAttribute(CarbonUIMessage.ID, uiMsg);
-%>
-<span id="responseMsg"><%=e.getMessage()%></span>
-<%
- }
-%>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 7754df0..00c9188 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -93,7 +93,6 @@
<module>org.apache.stratos.tenant.dispatcher</module>
<module>org.apache.stratos.keystore.mgt</module>
<module>org.apache.stratos.activation</module>
- <module>org.apache.stratos.cartridge.mgt.ui</module>
<!-- Theme mgt -->
<module>org.apache.stratos.theme.mgt.ui</module>
<module>org.apache.stratos.theme.mgt</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml b/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
deleted file mode 100644
index 6cf3b4a..0000000
--- a/features/manager/cartridge-mgt/org.apache.stratos.cartridge.mgt.ui.feature/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>cartridge-mgt-feature</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.cartridge.mgt.ui.feature</artifactId>
- <packaging>pom</packaging>
- <name>Apache Stratos - Cartridge Management UI Feature</name>
- <url>http://apache.org</url>
- <description>This feature contains the bundles required for Front-end Stratos manager</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.mgt.ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.manager.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.reponotification.service.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.wso2.maven</groupId>
- <artifactId>carbon-p2-plugin</artifactId>
- <version>${carbon.p2.plugin.version}</version>
- <executions>
- <execution>
- <id>p2-feature-generation</id>
- <phase>package</phase>
- <goals>
- <goal>p2-feature-gen</goal>
- </goals>
- <configuration>
- <id>org.apache.stratos.cartridge.mgt.ui</id>
- <propertiesFile>../../etc/feature.properties</propertiesFile>
- <adviceFile>
- <properties>
- <propertyDef>org.wso2.carbon.p2.category.type:console</propertyDef>
- <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
- </properties>
- </adviceFile>
- <bundles>
- <bundleDef>org.apache.stratos:org.apache.stratos.cartridge.mgt.ui:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.manager.stub:${project.version}</bundleDef>
- <bundleDef>org.apache.stratos:org.apache.stratos.adc.reponotification.service.stub:${project.version}</bundleDef>
- </bundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/features/manager/cartridge-mgt/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/cartridge-mgt/pom.xml b/features/manager/cartridge-mgt/pom.xml
deleted file mode 100644
index 33aa68b..0000000
--- a/features/manager/cartridge-mgt/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- # Licensed to the Apache Software Foundation (ASF) under one
- # or more contributor license agreements. See the NOTICE file
- # distributed with this work for additional information
- # regarding copyright ownership. The ASF licenses this file
- # to you under the Apache License, Version 2.0 (the
- # "License"); you may not use this file except in compliance
- # with the License. You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing,
- # software distributed under the License is distributed on an
- # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- # KIND, either express or implied. See the License for the
- # specific language governing permissions and limitations
- # under the License.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-features-parent</artifactId>
- <version>4.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>cartridge-mgt-feature</artifactId>
- <packaging>pom</packaging>
- <name>Apache Stratos - Cartridge Management UI Feature Aggregator Module</name>
- <url>http://apache.org</url>
-
- <modules>
- <module>org.apache.stratos.cartridge.mgt.ui.feature</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.cartridge.mgt.ui</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.manager.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.adc.reponotification.service.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-</project>
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/features/manager/pom.xml
----------------------------------------------------------------------
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 0a0fbdb..ff94988 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -44,7 +44,6 @@
<module>deployment</module>
<module>status-monitor</module>
<module>tenant-activity</module>
- <module>cartridge-mgt</module>
<module>logging-mgt</module>
<module>rest-endpoint/org.apache.stratos.rest.endpoint.feature</module>
<module>styles/org.apache.stratos.manager.styles.feature</module>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/products/stratos/conf/features-dashboard.xml
----------------------------------------------------------------------
diff --git a/products/stratos/conf/features-dashboard.xml b/products/stratos/conf/features-dashboard.xml
index 4b6887e..df1118b 100755
--- a/products/stratos/conf/features-dashboard.xml
+++ b/products/stratos/conf/features-dashboard.xml
@@ -62,32 +62,5 @@
</story-links>
</story>
</service>
- <service name="Stratos Controller" link="" key="sc">
- <story title="Multi-Tenant Cartridges">
- <story-content>Stratos Cartridges, hosting WSO2 multi-tenant middleware
- services delivers multi-tenancy within each Cartridge instance
- where teams may define multiple tenants per Cartridge.
- </story-content>
- <story-links>
- <link url="/carbon/cartridge-mgt/available_cartridges.jsp?item=available_multitenant_cartridges">Available Multi-Tenant Cartridges</link>
- </story-links>
- </story>
- <story title="Single-Tenant Cartridges">
- <story-content>Stratos Cartridges provide process-level isolation and
- instance-level dedicated tenancy with single-tenant containers and frameworks.
- </story-content>
- <story-links>
- <link url="/carbon/cartridge-mgt/available_cartridges.jsp?item=available_singletenant_cartridges">Available Single-Tenant Cartridges</link>
- </story-links>
- </story>
- <story title="Subscribed Cartridges">
- <story-content>The tenant user can see all details of the Subscribed Cartridges such as
- the status and the number of running instances at the moment.
- </story-content>
- <story-links>
- <link url="/carbon/cartridge-mgt/subscribed_cartridges.jsp">Subscribed Cartridges</link>
- </story-links>
- </story>
- </service>
</data>
http://git-wip-us.apache.org/repos/asf/stratos/blob/d4b36b84/products/stratos/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/p2-profile-gen/pom.xml b/products/stratos/modules/p2-profile-gen/pom.xml
index 1e14598..4c19f7b 100644
--- a/products/stratos/modules/p2-profile-gen/pom.xml
+++ b/products/stratos/modules/p2-profile-gen/pom.xml
@@ -204,7 +204,6 @@
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.caching.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.rm.server.feature:${carbon.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.manager.feature:${project.version}</featureArtifactDef>
- <featureArtifactDef>org.apache.stratos:org.apache.stratos.cartridge.mgt.ui.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.apache.stratos:org.apache.stratos.rest.endpoint.feature:${project.version}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${carbon.platform.patch.version.4.2.1}</featureArtifactDef>
<featureArtifactDef>org.wso2.carbon:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${carbon.platform.patch.version.4.2.2}</featureArtifactDef>
@@ -401,10 +400,6 @@
<version>${project.version}</version>
</feature>
<feature>
- <id>org.apache.stratos.cartridge.mgt.ui.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.apache.stratos.rest.endpoint.feature.group</id>
<version>${project.version}</version>
</feature>
@@ -684,10 +679,6 @@
<version>${project.version}</version>
</feature>
<feature>
- <id>org.apache.stratos.cartridge.mgt.ui.feature.group</id>
- <version>${project.version}</version>
- </feature>
- <feature>
<id>org.apache.stratos.rest.endpoint.feature.group</id>
<version>${project.version}</version>
</feature>