You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/23 21:15:21 UTC
[07/11] stratos git commit: Cleaning up pom files,
removing unused features from p2 profile,
removing unused components in Stratos
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
deleted file mode 100644
index 3faaca3..0000000
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/syslog_index.jsp
+++ /dev/null
@@ -1,372 +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" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon" %>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page
- import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogInfo" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogEvent" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogInfo" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="java.util.regex.Matcher" %>
-<%@ page import="java.util.regex.Pattern" %>
-<script type="text/javascript" src="js/logviewer.js"></script>
-<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
-
-<script type="text/javascript">
- function startDownload() {
- var url = 'download-ajaxprocessor.jsp';
- //jQuery.get(url);
- }
-</script>
-<%!
- private boolean isArchiveFile(String fileName) {
- String archivePattern = "[a-zA-Z]*\\.gz";
- CharSequence inputStr = fileName;
- Pattern pattern = Pattern.compile(archivePattern);
- Matcher matcher = pattern.matcher(inputStr);
- return matcher.find();
- }
-%>
-<%
- 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);
- LogViewerClient logViewerClient;
- String action;
- LogMessage[] logMessages;
- LogInfo[] logInfo;
- String tenantDomain = "";
- String serviceName = "WSO2 Stratos Manager";
- boolean isLogsFromSyslog;
- PaginatedLogInfo paginatedLogInfo;
- boolean isStratosService = false;
- String pageNumberStr = request.getParameter("pageNumber");
- boolean isSTSyslog = false;
- String serviceNames[];
- boolean isManager = false;
- boolean showManager = false;
- if (pageNumberStr == null) {
- pageNumberStr = "0";
- }
- boolean showTenantDomain = false;
- int pageNumber = 0;
- int numberOfPages = 0;
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- try {
-
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- action = request.getParameter("action");
- tenantDomain = request.getParameter("tenantDomain");
- serviceName = request.getParameter("serviceName");
- isLogsFromSyslog = logViewerClient.isDataFromSysLog(tenantDomain);
- isSTSyslog = logViewerClient.isSTSyslogConfig(tenantDomain);
- isManager = logViewerClient.isManager();
-
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- serviceNames = logViewerClient.getServiceNames();
- isStratosService = logViewerClient.isStratosService();
- showTenantDomain = (isSTSyslog && isLogsFromSyslog && isStratosService);
- showManager = (isManager && isLogsFromSyslog);
- if (logViewerClient.isLogsConfigured(tenantDomain)) {
- paginatedLogInfo = logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- if (paginatedLogInfo != null) {
- logInfo = paginatedLogInfo.getLogInfo();
- numberOfPages = paginatedLogInfo.getNumberOfPages();
- //logMessages = logViewerClient.getTenentLogs();
-
- //logMessages = logViewerClient.getLogs(type, keyword);
-
- for (int i = 0; i < logInfo.length; i++) {
- String logFile = logInfo[i].getLogName();
- String logDate = logInfo[i].getLogDate();
- String logSize = logInfo[i].getLogDate();
- }
- } else {
- logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- CarbonUIMessage.sendCarbonUIMessage(
- "Please configure syslog in order to view tenant specific logs.",
- CarbonUIMessage.ERROR, request);
-%>
-<script type="text/javascript">
- location.href = "../admin/error.jsp";
-</script>
-<%
- return;
- }
-
-} else {
- logViewerClient.getPaginatedLogInfo(pageNumber,
- tenantDomain, serviceName);
- CarbonUIMessage.sendCarbonUIMessage(
- "Please configure syslog in order to view tenant specific logs.",
- CarbonUIMessage.ERROR, request);
-%>
-<script type="text/javascript">
- location.href = "../admin/error.jsp";
-</script>
-<%
- return;
- }
-
-} catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getLocalizedMessage(), CarbonUIMessage.ERROR, request,
- e);
-%>
-<script type="text/javascript">
- location.href = "../admin/error.jsp";
-</script>
-<%
- return;
- }
-%>
-
-<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
- <carbon:breadcrumb label="system.logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="true" request="<%=request%>"/>
- <div id="middle">
- <h2>
- <fmt:message key="system.logs"/>
- </h2>
-
- <div id="workArea">
- <br/>
- <%
- if (isLogsFromSyslog) {
- %>
- <font color="blue"><fmt:message
- key="remote.log.location.information"/>
- </font>
- <%
- } else {
- %>
- <font color="blue"><fmt:message
- key="local.log.location.information"/>
- </font>
- <%
- }
- %>
-
- <br/> <br/>
- <%
- if (showTenantDomain || showManager) {
- %>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
-
- <table class="normal">
- <tr>
- <%
- if (showTenantDomain) {
- %>
-
- <td style="padding-right: 2px !important;">
- <nobr>
- <fmt:message key="tenant.domain"/>
- </nobr>
- </td>
- <td style="padding-right: 2px !important;"><input
- value="<%=tenantDomain%>" id="tenantDomain"
- name="tenantDomain" size="20" type="text"></td>
-
- <td style="padding-left: 0px !important;"><input
- type="button" value="Get Tenant Logs"
- onclick="javascript:getTenantSpecificIndex(); return false;"
- class="button"></td>
- <%
- } else {
- %>
- <td><input type="hidden" id="tenantDomain"
- name="tenantDomain" value="<%=tenantDomain%>"/>
- </td>
- <%
- }
- if (showManager) {
- %>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;">
- <nobr>
- <fmt:message key="service.name"/>
- </nobr>
- </td>
- <td style="width: 100%;"></td>
- <td style="padding-left: 0px !important;"><select
- name="serviceName" id="serviceName"
- onchange="getProductTenantSpecificIndex()">
- <%
- for (String name : serviceNames) {
- %>
- <%
- if (name.equals(serviceName)) {
- %>
- <option selected="selected" value="<%=name%>">
- <%=name%>
- </option>
- <%
- } else {
- %>
- <option value="<%=name%>">
- <%=name%>
- </option>
- <%
- }
- %>
- <%
- }
- %>
-
- </select></td>
- <%
- } else {
- %>
- <input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>"/>
- <%
- }
- %>
- </tr>
-
-
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- <%
- }
- %>
- <br/> <br/>
- <carbon:paginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>" page="index.jsp"
- pageNumberParameterName="pageNumber"/>
- <table border="1" class="styledLeft">
- <tbody>
-
- <tr>
- <td class="formRow">
- <table class="styledLeft">
- <thead>
- <tr>
- <th><b><fmt:message key="file.name"/> </b></th>
- <th><b><fmt:message key="date"/> </b></th>
- <th><b><fmt:message key="file.size"/> </b></th>
- <th><b><fmt:message key="action"/> </b></th>
- </tr>
- </thead>
- <%
- int index = -1;
- for (LogInfo logMessage : logInfo) {
- ++index;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
- } else {
- %>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- if (logMessage.getLogName().trim().equalsIgnoreCase("NO_LOG_FILES")) {
- %>
-
- <td colspan="4"><fmt:message key="no.logs"/></td>
- <%
- } else {
- String logFile = logMessage.getLogName().replace("0_", "");
- String logDate = logMessage.getLogDate().replace("0_", "");
- String logSize = logMessage.getFileSize();
- %>
-
- <td><%=logFile%>
- </td>
- <td><%=logDate%>
- </td>
- <td><%=logSize%>
- </td>
- <td>
- <% if (!isArchiveFile(logFile)) { %>
- <a class="icon-link"
- style="background-image: url(images/view.gif);"
- href="view.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="view"/> </a>
- <%
- }
- %>
- <% if (isArchiveFile(logFile)) { %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="downloadgz-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download"/> </a>
- <%
- } else {
- %>
- <a class="icon-link"
- style="background-image: url(images/download.gif);"
- onclick="startDownload()"
- href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download"/> </a>
- <%
- }
- %>
- </td>
-
- <%
- }
- %>
-
- </tr>
-
- <%
- }
- %>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- <carbon:paginator pageNumber="<%=pageNumber%>"
- numberOfPages="<%=numberOfPages%>" page="index.jsp"
- pageNumberParameterName="pageNumber"/>
- </div>
- </div>
-</fmt:bundle>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp b/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
deleted file mode 100755
index 560a2c3..0000000
--- a/components/org.apache.stratos.logging.view.ui/src/main/resources/web/log-view/view.jsp
+++ /dev/null
@@ -1,314 +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" %>
-<%@ taglib uri="http://wso2.org/projects/carbon/taglibs/carbontags.jar"
- prefix="carbon" %>
-<%@ page import="org.apache.stratos.logging.view.ui.LogViewerClient" %>
-<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%@ page import="org.wso2.carbon.ui.util.CharacterEncoder" %>
-<%@ page import="org.wso2.carbon.CarbonConstants" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.LogMessage" %>
-<%@ page import="org.wso2.carbon.utils.ServerConstants" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIUtil" %>
-<%@ page import="org.wso2.carbon.logging.view.stub.types.carbon.PaginatedLogMessage" %>
-<%@ page import="org.wso2.carbon.ui.CarbonUIMessage" %>
-<script type="text/javascript" src="js/logviewer.js"></script>
-<script type="text/javascript" src="../admin/dialog/js/dialog.js"></script>
-<fmt:bundle basename="org.apache.stratos.logging.view.ui.i18n.Resources">
- <carbon:breadcrumb label="View Logs"
- resourceBundle="org.wso2.carbon.logging.ui.i18n.Resources"
- topPage="false" request="<%=request%>"/>
- <%
- 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);
- LogViewerClient logViewerClient;
- String logIndex = "";
- String keyword;
- String action;
- String logFile;
- String type;
- String keyWordString = "";
- String serviceName = "WSO2 Stratos Manager";
- String tenantDomain = "";
- LogMessage[] logMessages;
- PaginatedLogMessage paginatedLogMsgs;
- String pageNumberStr = request.getParameter("pageNumber");
- logFile = request.getParameter("logFile");
- String parameter = "";
- if (pageNumberStr == null) {
- pageNumberStr = "0";
- }
- int pageNumber = 0;
- int numberOfPages = 0;
- try {
- pageNumber = Integer.parseInt(pageNumberStr);
- } catch (NumberFormatException ignored) {
- // page number format exception
- }
- String numberOfBottomLines = "";
- try {
- logViewerClient = new LogViewerClient(cookie, backendServerURL, configContext);
- logIndex = request.getParameter("logIndex");
- keyword = request.getParameter("keyword");
- serviceName = request.getParameter("serviceName");
- tenantDomain = request.getParameter("tenantDomain");
- keyWordString = (keyword == null) ? "" : keyword;
- keyWordString = (keyWordString.equals("null")) ? "" : keyWordString;
- serviceName = (serviceName == null) ? "WSO2 Stratos Manager" : serviceName;
- if (keyWordString.trim().equals("")) {
- keyword = null;
- }
- action = request.getParameter("action");
- type = request.getParameter("type");
- type = (type == null) ? "ALL" : type;
- tenantDomain = (tenantDomain == null) ? "" : tenantDomain;
- int start = (pageNumber * 200) + 1;
- int end = (pageNumber * 200) + 200;
- int maxLines = logViewerClient.getLineNumbers(logFile, tenantDomain, serviceName);
- int maxLenPerItr = (pageNumber + 1) * 1000;
- if (maxLines > 1000) {
-
- }
- String logIndex1 = Integer.toString(maxLines);
- if (logIndex != null && !logIndex.equals("null") && !logIndex.equals("")) {
- //int index = Integer.parseInt(logIndex);
- paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type,
- keyword, logFile, logIndex, maxLines, start, end, tenantDomain, serviceName);
- } else {
- paginatedLogMsgs = logViewerClient.getPaginatedBottomUpLogMessage(pageNumber,
- type, keyword, logFile, maxLines, start, end, tenantDomain, serviceName);
- //paginatedLogMsgs = logViewerClient.getPaginatedLogMessage(pageNumber, type, keyword, logFile, logIndex1, maxLines, start, end);
- }
- logMessages = paginatedLogMsgs.getLogInfo();
- numberOfPages = paginatedLogMsgs.getNumberOfPages();
- if (logIndex != null && !logIndex.endsWith("null")) {
- numberOfBottomLines = logIndex;
- }
- parameter = "logFile=" + logFile + "&logIndex=" + logIndex + "&type=" + type
- + "&keyword=" + keyword + "&tenantDomain=" + tenantDomain + "&serviceName=" + serviceName;
-
- } catch (Exception e) {
- CarbonUIMessage.sendCarbonUIMessage(e.getMessage(), CarbonUIMessage.ERROR, request,
- e);
- %>
- <script type="text/javascript">
- location.href = "../admin/error.jsp";
- </script>
- <%
- return;
- }
- %>
-
-
- <div id="middle">
- <h2>
- <fmt:message key="system.logs.view"/>
- </h2>
-
- <div id="workArea">
- <input type="hidden" id="serviceName" name="serviceName"
- value="<%=serviceName%>"/>
- <input type="hidden" id="logFile" name="logFile"
- value="<%=logFile%>"/>
- <input type="hidden" id="tenantDomain" name="tenantDomain"
- value="<%=tenantDomain%>"/>
- <table border="0" class="styledLeft">
- <tbody>
- <tr>
- <td>
- <table class="normal-nopadding">
- <tr>
- <td><fmt:message key="view"/>
- </td>
- <td><select class="log-select" id="logLevelID"
- onchange="javascript:viewSingleSysLogLevel(); return false;">
- <%
- String[] logLevels = logViewerClient.getLogLevels();
- if (keyword != null) {
- type = "Custom";
- %>
-
- <option value="<%=type%>" selected="true"><%=type%>
- </option>
-
- <%
- }
- for (String logLevel : logLevels) {
- if (logLevel.equals(type)) {
- %>
-
- <option value="<%=logLevel%>" selected="true"><%=logLevel%>
- </option>
-
- <%
- } else {
- %>
-
- <option value="<%=logLevel%>"><%=logLevel%>
- </option>
-
- <%
- }
- }
- %>
- </select>
- </td>
- <td style="width: 100%;"></td>
- <td>
- <nobr>
- <fmt:message key="search.logs"/>
- </nobr>
- </td>
- <td style="padding-right: 2px !important;"><input
- onkeypress="submitenter(event)" value="<%=keyWordString%>" class="log-select"
- size="30" id="keyword" type="text">
- </td>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Search"
- onclick="javascript:searchTenantLog(); return false;" class="button">
- </td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td style="width: 100%;"></td>
- <td class="leftCol-med">
- <nobr><fmt:message key="log.head"/></nobr>
- </td>
- <td style="padding-left: 0px !important;"><carbon:tooltips image="images/trace.png"
- key='log.head.help'
- noOfWordsPerLine="6"/></td>
- <td style="padding-left: 0px !important;"><input onkeypress="submitenterbottomUp(event)"
- value="<%=numberOfBottomLines%>"
- id="logIndex" name="logIndex"
- size="10" type="text">
- </td>
- <td style="padding-left: 0px !important;"><input
- type="button" value="Search"
- onclick="javascript:searchLogBottomLogs(); return false;"
- class="button">
-
- </td>
- </tr>
-
-
- </table>
- </td>
- </tr>
- </tbody>
- </table>
-
- <br/>
- <%-- <carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
- <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> --%>
- <table border="1" class="styledLeft">
-
- <tbody>
-
- <tr>
- <td class="formRow">
-
- <table class="styledLeft">
-
- <thead>
- <tr>
- <th><b><fmt:message key="log.type"/>
- </b>
- </th>
- <th><b><fmt:message key="log.message"/>
- </b>
- </th>
- </tr>
- </thead>
- <%
- int index = -1;
- int i = 0;
- for (LogMessage logMessage : logMessages) {
- ++index;
- i++;
- if (index % 2 != 0) {
- %>
- <tr>
- <%
- } else {
- %>
-
- <tr bgcolor="#eeeffb">
- <%
- }
- if (logMessage != null) {
- String logLevel = logMessage.getType();
- if (logLevel == null || logLevel.equals("")) {
- %>
- <td border-bottom="gray" width="2%"></td>
- <%
- } else {
- %>
- <td border-bottom="gray" width="2%"><img
- style="margin-right: 10px;"
- src="<%=logViewerClient.getImageName(logMessage.getType().trim())%>">
- </td>
- <%
- }
- %>
- <td>
- <%
- if (logMessage.getLogMessage().equalsIgnoreCase("NO_LOGS")) {
- %> <fmt:message key="no.logs"/> <%
- } else {
- %> <%=CharacterEncoder.getSafeText(logMessage.getLogMessage())%> <%
- }
- %>
- </td>
- </tr>
-
- <%
- }
- }
- %>
-
- </table>
- <%
- if (i >= 199) {
- %>
-
- <tr bgcolor="#eeeffb">
- <td> Only 200 log messages are displayed, please <a
- href="download-ajaxprocessor.jsp?logFile=<%=logFile%>&tenantDomain=<%=tenantDomain%>&serviceName=<%=serviceName%>"><fmt:message
- key="download"/></a> for more ...
- <td>
- </tr>
-
- <%
- }
- %>
- </td>
- </tr>
- <%-- <tr><carbon:paginator pageNumber="<%=pageNumber%>" numberOfPages="<%=numberOfPages%>" --%>
- <%-- page="view.jsp" pageNumberParameterName="pageNumber" parameters="<%=parameter%>"/> <tr> --%>
-
- </tbody>
- </table>
-
- </div>
- </div>
-</fmt:bundle>
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.manager.styles/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.styles/pom.xml b/components/org.apache.stratos.manager.styles/pom.xml
index cf5343a..6e67a4e 100644
--- a/components/org.apache.stratos.manager.styles/pom.xml
+++ b/components/org.apache.stratos.manager.styles/pom.xml
@@ -19,6 +19,7 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
@@ -26,22 +27,15 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.manager.styles</artifactId>
<packaging>bundle</packaging>
<name>Apache Stratos - Cloud Manager UI styles</name>
- <url>http://apache.org</url>
<build>
<plugins>
<plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
<extensions>true</extensions>
<configuration>
<instructions>
@@ -74,56 +68,45 @@
</build>
<dependencies>
-
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>1.0.3</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>1.0.3</version>
</dependency>
-
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>1.0.0</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.servlet</artifactId>
<version>2.2.2</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.http.helper</artifactId>
<version>1.0.0</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.jsp.jasper</artifactId>
<version>1.0.1.R33x_v20070816</version>
</dependency>
-
<dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>javax.servlet.jsp</artifactId>
<version>2.0.0.v200706191603</version>
</dependency>
</dependencies>
- <properties>
- <wso2carbon.version>4.2.0</wso2carbon.version>
- </properties>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.manager/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/pom.xml b/components/org.apache.stratos.manager/pom.xml
index 6f397a3..58cad4c 100644
--- a/components/org.apache.stratos.manager/pom.xml
+++ b/components/org.apache.stratos.manager/pom.xml
@@ -20,30 +20,28 @@
<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">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.manager</artifactId>
<packaging>bundle</packaging>
<name>Apache Stratos - Manager</name>
<description>Stratos Manager (SM)</description>
- <url>http://apache.org</url>
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -86,7 +84,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
<extensions>true</extensions>
<configuration>
<instructions>
@@ -117,7 +114,6 @@
<plugin>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl-maven-plugin</artifactId>
- <version>1.6.1-wso2v10</version>
<configuration>
<className>org.apache.stratos.manager.services.impl.StratosManagerServiceImpl</className>
<outputFileName>target/generated-resources/wsdl/StratosManagerService.wsdl</outputFileName>
@@ -133,4 +129,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.messaging/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/pom.xml b/components/org.apache.stratos.messaging/pom.xml
index 3c4175d..78a5761 100644
--- a/components/org.apache.stratos.messaging/pom.xml
+++ b/components/org.apache.stratos.messaging/pom.xml
@@ -19,18 +19,16 @@
-->
<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">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.messaging</artifactId>
<packaging>bundle</packaging>
<name>Apache Stratos - Messaging</name>
- <url>http://apache.org</url>
<dependencies>
<dependency>
@@ -61,12 +59,12 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>com.jamesmurty.utils</groupId>
@@ -94,6 +92,10 @@
<version>5.10.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -105,7 +107,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
<extensions>true</extensions>
<configuration>
<instructions>
@@ -129,4 +130,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.metadata.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.client/pom.xml b/components/org.apache.stratos.metadata.client/pom.xml
index 831931d..184d785 100644
--- a/components/org.apache.stratos.metadata.client/pom.xml
+++ b/components/org.apache.stratos.metadata.client/pom.xml
@@ -18,7 +18,7 @@
-->
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
@@ -27,8 +27,6 @@
<artifactId>org.apache.stratos.metadata.client</artifactId>
<packaging>bundle</packaging>
- <modelVersion>4.0.0</modelVersion>
-
<name>Apache Stratos - Metadata Client</name>
<dependencies>
@@ -41,7 +39,6 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.9</version>
- <!-- <scope>provided</scope>-->
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -59,7 +56,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -81,5 +77,4 @@
</plugin>
</plugins>
</build>
-
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.metadata.service/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.metadata.service/pom.xml b/components/org.apache.stratos.metadata.service/pom.xml
index 7ec6cff..1b6e2bb 100644
--- a/components/org.apache.stratos.metadata.service/pom.xml
+++ b/components/org.apache.stratos.metadata.service/pom.xml
@@ -18,13 +18,13 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.metadata.service</artifactId>
<packaging>war</packaging>
<name>Apache Stratos - Metadata Service</name>
@@ -53,31 +53,23 @@
</profile>
</profiles>
-
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- <version>2.3.2</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
<configuration>
<webResources>
<resource>
- <!-- this is relative to the pom.xml directory -->
<directory>src/main/webapp/${appName}</directory>
</resource>
</webResources>
<warName>metadata</warName>
</configuration>
</plugin>
-
</plugins>
</build>
@@ -92,19 +84,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -146,13 +138,13 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.ntask.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.registry.ws.stub</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -162,4 +154,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.mock.iaas.api/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.api/pom.xml b/components/org.apache.stratos.mock.iaas.api/pom.xml
index 1bfa338..b2ccbc1 100644
--- a/components/org.apache.stratos.mock.iaas.api/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.api/pom.xml
@@ -18,13 +18,13 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.mock.iaas.api</artifactId>
<packaging>war</packaging>
<name>Apache Stratos - Mock IaaS API</name>
@@ -44,16 +44,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- <version>2.3.2</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
<configuration>
<webResources>
<resource>
@@ -78,19 +73,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -112,4 +107,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.mock.iaas.client/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas.client/pom.xml b/components/org.apache.stratos.mock.iaas.client/pom.xml
index e420088..e1b3993 100644
--- a/components/org.apache.stratos.mock.iaas.client/pom.xml
+++ b/components/org.apache.stratos.mock.iaas.client/pom.xml
@@ -17,16 +17,14 @@
~ 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/xsd/maven-4.0.0.xsd">
+<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.mock.iaas.client</artifactId>
<name>Apache Stratos - Mock IaaS API Client</name>
@@ -56,10 +54,12 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -83,11 +83,10 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
-
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.apache.stratos.mock.iaas.client.*,
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.mock.iaas/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/pom.xml b/components/org.apache.stratos.mock.iaas/pom.xml
index 8a76d60..6707e0d 100644
--- a/components/org.apache.stratos.mock.iaas/pom.xml
+++ b/components/org.apache.stratos.mock.iaas/pom.xml
@@ -17,15 +17,14 @@
# 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/xsd/maven-4.0.0.xsd">
+<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>stratos-components-parent</artifactId>
<groupId>org.apache.stratos</groupId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.mock.iaas</artifactId>
<name>Apache Stratos - Mock IaaS</name>
@@ -35,17 +34,17 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.databridge.commons</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.stratos</groupId>
@@ -71,8 +70,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${pom.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
<Export-Package>
org.apache.stratos.mock.iaas.*,
org.apache.stratos.mock.iaas.domain.*,
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.python.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/pom.xml b/components/org.apache.stratos.python.cartridge.agent/pom.xml
index d1e85b7..e6eb941 100644
--- a/components/org.apache.stratos.python.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.python.cartridge.agent/pom.xml
@@ -19,13 +19,13 @@
<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.python.cartridge.agent</artifactId>
<packaging>jar</packaging>
<name>Apache Stratos - Python Cartridge Agent</name>
@@ -42,22 +42,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <exclude>**/*/PythonCartridgeAgentTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
<includes>
<include>**/*/PythonCartridgeAgentTest.java</include>
</includes>
@@ -77,7 +61,7 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
</dependency>
<dependency>
<groupId>commons-lang.wso2</groupId>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.rest.endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/pom.xml b/components/org.apache.stratos.rest.endpoint/pom.xml
index fc62724..f94389e 100644
--- a/components/org.apache.stratos.rest.endpoint/pom.xml
+++ b/components/org.apache.stratos.rest.endpoint/pom.xml
@@ -18,13 +18,13 @@
-->
<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">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stratos</groupId>
<artifactId>stratos-components-parent</artifactId>
<version>4.1.2-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stratos.rest.endpoint</artifactId>
<packaging>war</packaging>
<name>Apache Stratos - RESTful admin service module</name>
@@ -56,16 +56,11 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- <version>2.3.2</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
<configuration>
<webResources>
<resource>
@@ -90,19 +85,19 @@
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
- <version>${wso2carbon.version}</version>
+ <version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -148,4 +143,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/pom.xml b/components/org.apache.stratos.sso.redirector.ui/pom.xml
deleted file mode 100644
index 72e96b9..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/pom.xml
+++ /dev/null
@@ -1,77 +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-components-parent</artifactId>
- <version>4.1.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.sso.redirector.ui</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Stratos - SSO redirector UI component</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Name>${project.artifactId}</Bundle-Name>
- <Private-Package>
- org.apache.stratos.sso.redirector.ui.internal.*,
- </Private-Package>
- <Import-Package>
- javax.servlet;version="${imp.pkg.version.javax.servlet}",
- javax.servlet.http;version="${imp.pkg.version.javax.servlet}",
- org.apache.lucene.*,
- *;resolution:=optional
- </Import-Package>
- <Carbon-Component>UIBundle</Carbon-Component>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.ui</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.identity.authenticator.saml2.sso.common</artifactId>
- <version>${wso2carbon.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/RedirectorJSPFilter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/RedirectorJSPFilter.java b/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/RedirectorJSPFilter.java
deleted file mode 100644
index 1c7ef60..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/RedirectorJSPFilter.java
+++ /dev/null
@@ -1,60 +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.
- */
-
-package org.apache.stratos.sso.redirector.ui.internal;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * This class acts as a servlet filter which forwads the requests coming for sso-acs/redirect_ajaxprocessor.jsp
- * to stratos-auth/redirect_ajaxprocessor.jsp
- */
-public class RedirectorJSPFilter implements Filter {
-
- public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse,
- FilterChain filterChain) throws IOException, ServletException {
- if (!(servletRequest instanceof HttpServletRequest)) {
- return;
- }
- String url = ((HttpServletRequest) servletRequest).getRequestURI();
- if(url.contains("//")){
- url = url.replace("//", "/");
- }
- url = url.replace("sso-acs/redirect_ajaxprocessor.jsp", "stratos-auth/redirect_ajaxprocessor.jsp");
- RequestDispatcher requestDispatcher =
- servletRequest.getRequestDispatcher(url);
- requestDispatcher.forward(servletRequest, servletResponse);
- }
-
- public void init(FilterConfig filterConfig) throws ServletException {
- // not required to implement
- }
-
- public void destroy() {
- // not required to implement
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/SSORedirectorServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/SSORedirectorServiceComponent.java b/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/SSORedirectorServiceComponent.java
deleted file mode 100644
index 5f2521b..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/src/main/java/org/apache/stratos/sso/redirector/ui/internal/SSORedirectorServiceComponent.java
+++ /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.
- */
-
-package org.apache.stratos.sso.redirector.ui.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.service.component.ComponentContext;
-
-import javax.servlet.Filter;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Dictionary;
-import java.util.Hashtable;
-
-/**
- * @scr.component name="org.apache.stratos.sso.redirector.ui"
- * immediate="true"
- */
-public class SSORedirectorServiceComponent {
- private static Log log = LogFactory.getLog(SSORedirectorServiceComponent.class);
-
- protected void activate(ComponentContext ctxt) {
-
- // register a servlet filter for SSO redirector page
- HttpServlet redirectJSPRedirectorServlet = new HttpServlet() {
- protected void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- }
- };
-
- Filter redirectPageFilter = new RedirectorJSPFilter();
- Dictionary redirectorPageFilterAttrs = new Hashtable(2);
- Dictionary redirectorPageFilterParams = new Hashtable(2);
- redirectorPageFilterParams.put("url-pattern", "/carbon/sso-acs/redirect_ajaxprocessor.jsp");
- redirectorPageFilterParams.put("associated-filter", redirectPageFilter);
- redirectorPageFilterParams.put("servlet-attributes", redirectorPageFilterAttrs);
- ctxt.getBundleContext().registerService(Servlet.class.getName(), redirectJSPRedirectorServlet,
- redirectorPageFilterParams);
- log.debug("Stratos SSO Redirector bundle is activated..");
- }
-
- protected void deactivate(ComponentContext ctxt) {
- log.debug("Stratos SSO Redirector bundle is deactivated..");
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/org/apache/stratos/sso/redirector/ui/i18n/Resources.properties
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/org/apache/stratos/sso/redirector/ui/i18n/Resources.properties b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/org/apache/stratos/sso/redirector/ui/i18n/Resources.properties
deleted file mode 100644
index 3c9dee1..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/org/apache/stratos/sso/redirector/ui/i18n/Resources.properties
+++ /dev/null
@@ -1,53 +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.
-#
-#
-
-saml.sso.menu=SAML SSO
-saml.sso=SAML 2.0 based Single Sign-On
-enter.password.to.signin=Please enter your credentials to sign in to WSO2 Identity Server SAML SSO
-username=Username
-password=Password
-login=Sign In
-sso.configuration=SAML SSO Configuration
-sp.issuer=Issuer
-sp.assertionConsumerURL=Assertion Consumer URL
-sp.certAlias=Certificate Alias
-saml.sso.service.providers.not.found=No SAML SSO Service Providers are found.
-saml.sso.add.service.provider=Add new Service Provider
-saml.sso.add=Add
-sp.enter.valid.endpoint.address=Please enter a valid URL for AssertionConsumerURL
-sp.enter.valid.issuer=Please enter a valid issuer
-sp.enter.valid.claimID=ClaimID field cannot be left empty
-sp.added.successfully=Service Provider Added Successfully
-error.adding.sp=Could not add Service Provider. You might be entering a duplicate Service Provider
-remove.message1=You are about to remove the trusted service provider
-remove.message2=. Do you want to proceed?
-error.removing.sp=Problem in removing the service provider
-select.subject.type=Select the value to be appeared as the subject
-select.subject.type.username=Use current username as the subject
-select.subject.type.claimid=Use a custom claim as the subject
-subject.type.claimid=Claim ID
-subject.type.namidformat=NameID Format
-logout.url=Custom Logout URL
-validate.signature=Enable Signature Validation in Authentication Requests and Logout Requests
-saml.sso.generated.key=Generated Key for Signing SAML2 based single sign-on
-saml.sso.download.pub.key=Download the public key of the generated key pair
-saml.sso.add.sp.to.genkey=Add atleast one service provider to generate a key pair
-login.fail.message=Login failed! Please recheck the username and password and try again.
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/css/stratos-loginpage.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/css/stratos-loginpage.css b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/css/stratos-loginpage.css
deleted file mode 100644
index 34d2604..0000000
--- a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/css/stratos-loginpage.css
+++ /dev/null
@@ -1,115 +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.
- *
-*/
-
-body {
-background-image:url(../images/st-login-body-bg.gif);
-background-position:left top;
-background-repeat:repeat-x;
-font-family:"Calibri",Arial,Helvetica,san-serif;
-font-size:0.8em;
-margin:0;
-padding:0;
-}
-p {
-}
-td {
-}
-a:link {
-text-decoration:none;
-}
-a:visited {
-}
-a:hover {
-}
-a:active {
-}
-a img {
-border:0 none;
-}
-div#middle {
-background-color:#FFFFFF;
-margin:auto;
-width:961px;
-}
-div#header {
-background-image:url(../images/st-login-header-bg.gif);
-background-position:left top;
-background-repeat:no-repeat;
-height:87px;
-padding-top:94px;
-text-align:center;
-}
-div#content {
-background-image:url(../images/st-login-content-bg.gif);
-background-position:left top;
-background-repeat:no-repeat;
-padding-left:60px;
-padding-right:60px;
-padding-top:20px;
-}
-div#intro {
-padding-bottom:10px;
-text-align:center;
-}
-div#register {
-float:left;
-padding-top:85px;
-text-align:center;
-width:420px;
-}
-div#sign-in {
-border-left:1px solid #0499CC;
-float:left;
-padding:20px 30px 30px 50px;
-text-align:left;
-width:340px;
-}
-div#sign-in h2 {
-border-bottom:1px solid #78BDE8;
-font-size:130%;
-margin-bottom:10px;
-margin-top:0;
-padding-bottom:10px;
-padding-top:0;
-}
-div#sign-in table tr td {
-padding-bottom:5px;
-padding-right:7px;
-}
-div#sign-in table {
-border-bottom:1px solid #78BDE8;
-margin-bottom:7px;
-}
-div#footer {
-background-image:url(../images/st-login-footer-bg.gif);
-background-position:left top;
-background-repeat:no-repeat;
-margin-top:5px;
-padding-bottom:7px;
-padding-top:25px;
-text-align:center;
-}
-div.clear {
-clear:both;
-}
-#loginForm td label{
- font-size:11px;
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config-ok.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config-ok.png b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config-ok.png
deleted file mode 100644
index eab6259..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config-ok.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config.png b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config.png
deleted file mode 100644
index 994c861..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-identity-sso-config.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-sso-config.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-sso-config.png b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-sso-config.png
deleted file mode 100644
index 375e9ee..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/cloud-sso-config.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/delete.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/delete.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/delete.gif
deleted file mode 100644
index 471f55c..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/delete.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/import.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/import.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/import.gif
deleted file mode 100644
index c9fb1df..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/import.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/loading.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/loading.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/loading.gif
deleted file mode 100644
index 5b200ed..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/loading.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/logo.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/logo.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/logo.gif
deleted file mode 100644
index 837f813..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/logo.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/policy.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/policy.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/policy.gif
deleted file mode 100644
index f9c58f5..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/policy.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/powered.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/powered.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/powered.gif
deleted file mode 100644
index b8bc163..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/powered.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/register.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/register.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/register.gif
deleted file mode 100644
index f225e38..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/register.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/sso.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/sso.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/sso.gif
deleted file mode 100644
index 7f2e74a..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/sso.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-body-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-body-bg.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-body-bg.gif
deleted file mode 100644
index dc2c240..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-body-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-content-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-content-bg.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-content-bg.gif
deleted file mode 100644
index 9624125..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-content-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-footer-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-footer-bg.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-footer-bg.gif
deleted file mode 100644
index dc317e5..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-footer-bg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/028c3539/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-header-bg.gif
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-header-bg.gif b/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-header-bg.gif
deleted file mode 100644
index bd228c9..0000000
Binary files a/components/org.apache.stratos.sso.redirector.ui/src/main/resources/web/stratos-auth/images/st-login-header-bg.gif and /dev/null differ