[Carbon-dev] svn commit r23072 - in trunk/carbon-components: axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1 server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js
sameera at wso2.com
sameera at wso2.com
Wed Oct 29 06:08:42 PDT 2008
Author: sameera
Date: Wed Oct 29 06:08:41 2008
New Revision: 23072
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23072
Log:
Fixed services managment component to display messages
Added:
trunk/carbon-components/server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF/
trunk/carbon-components/server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF/component.xml
trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/display-messages.jsp
Modified:
trunk/carbon-components/axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1/index.jsp
trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js/services.js
trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/service_mgt.jsp
Modified: trunk/carbon-components/axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1/index.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1/index.jsp?rev=23072&r1=23071&r2=23072&view=diff
==============================================================================
--- trunk/carbon-components/axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1/index.jsp (original)
+++ trunk/carbon-components/axis1-services/org.wso2.carbon.axis1services.ui/src/main/resources/web/axis1/index.jsp Wed Oct 29 06:08:41 2008
@@ -41,8 +41,7 @@
<h2>New Axis1 Service</h2>
<div id="formset">
- <form method="post" name="wsddUpload" action="../../fileupload/wsdd"
- enctype="multipart/form-data" target="self">
+ <form method="post" name="wsddUpload" action="../../fileupload/wsdd" enctype="multipart/form-data" target="_self">
<br/>
<fieldset>
<legend>Upload WSDD file and Jar resources</legend>
Added: trunk/carbon-components/server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF/component.xml
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF/component.xml?pathrev=23072
==============================================================================
--- (empty file)
+++ trunk/carbon-components/server-admin/org.wso2.carbon.server.admin.ui/src/main/resources/META-INF/component.xml Wed Oct 29 06:08:41 2008
@@ -0,0 +1,15 @@
+<component xmlns="http://products.wso2.org/carbon">
+ <!-- sample menu configuration -->
+ <menus>
+ <menu>
+ <id>shutdown_restart_menu</id>
+ <i18n-key>server-admin.shutdown-restart</i18n-key>
+ <i18n-bundle>org.wso2.carbon.i18n.Resources</i18n-bundle>
+ <parent-menu>manage_menu</parent-menu>
+ <link>../server-admin/index.jsp</link>
+ <region>region1</region>
+ <order>35</order>
+ <style-class>manage</style-class>
+ </menu>
+ </menus>
+</component>
\ No newline at end of file
Added: trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/display-messages.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/display-messages.jsp?pathrev=23072
==============================================================================
--- (empty file)
+++ trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/display-messages.jsp Wed Oct 29 06:08:41 2008
@@ -0,0 +1,46 @@
+<div id="alertMessageBox" style="display:none;position:absolute;z-index: 600;">
+ <!--the message area-->
+ <p id="alertMessageBoxMessageArea"></p>
+ <!-- the button area-->
+ <p id="alertButton" align="right">
+ <input id="alertBoxButton" type="button"
+ value=" OK "
+ onclick="document.getElementById('alertMessageBox').style.display='none';return false;"/>
+ </p>
+</div>
+<script language="JavaScript" type="text/javascript">
+ var msgId;
+ <%
+ if(request.getParameter("msgId") == null){
+ %>
+ msgId = '<%="MSG" + System.currentTimeMillis() + Math.random()%>';
+ <%
+ } else {
+ %>
+ msgId = '<%=request.getParameter("msgId")%>';
+ <%
+ }
+ %>
+</script>
+<%
+
+ if (request.getParameter("errorMessage") != null) {
+%>
+<script language="JavaScript" type="text/javascript">
+ if (getCookie(msgId) == null) {
+ wso2.wsf.Util.alertWarning('<%=request.getParameter("errorMessage")%>');
+ setCookie(msgId, 'true');
+ }
+</script>
+<%
+} else if (request.getParameter("message") != null) {
+%>
+<script language="JavaScript" type="text/javascript">
+ if (getCookie(msgId) == null) {
+ wso2.wsf.Util.alertMessage('<%=request.getParameter("message")%>');
+ setCookie(msgId, 'true');
+ }
+</script>
+<%
+ }
+%>
\ No newline at end of file
Modified: trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js/services.js
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js/services.js?rev=23072&r1=23071&r2=23072&view=diff
==============================================================================
--- trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js/services.js (original)
+++ trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/extensions/core/js/services.js Wed Oct 29 06:08:41 2008
@@ -408,3 +408,20 @@
function addHistoryForServiceInfo() {
updateHistory(serviceSpecificName, self.location.toString(), "xslt", "listServiceData('" + serviceSpecificName + "')");
}
+
+
+function completeServiceFileUpload(msg) {
+ wso2.wsf.Util.cursorWait();
+ if (msg) {
+ showAARGenerationCompleteMsg(msg);
+ } else {
+ showAARGenerationCompleteMsg("Archive was successfully uploaded.\n" +
+ "This page will be auto refreshed shortly.");
+ }
+}
+
+function showAARGenerationCompleteMsg(msg) {
+ wso2.wsf.Util.cursorClear();
+ wso2.wsf.Util.alertMessage(msg);
+ showServiceInitializer();
+}
Modified: trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/service_mgt.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/service_mgt.jsp?rev=23072&r1=23071&r2=23072&view=diff
==============================================================================
--- trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/service_mgt.jsp (original)
+++ trunk/carbon-components/service-mgt/org.wso2.carbon.service.mgt.ui/src/main/resources/web/service-mgt/service_mgt.jsp Wed Oct 29 06:08:41 2008
@@ -14,11 +14,11 @@
<%@ page import="org.wso2.registry.Resource" %>
<link href="../styles/main.css" rel="stylesheet" type="text/css" media="all"/>
<script language="javascript" src="global-params.js"></script>
- <script language="javascript" src="../main/admin/js/main.js"></script>
- <script language="javascript" src="../main/admin/js/dhtmlHistory.js"></script>
- <script language="javascript" src="../main/admin/js/WSRequest.js"></script>
- <script language="javascript" src="../main/admin/js/breadcrumbs.js"></script>
- <script language="javascript" src="../main/admin/js/cookies.js"></script>
+ <!--<script language="javascript" src="../main/admin/js/main.js"></script>-->
+ <!--<script language="javascript" src="../main/admin/js/dhtmlHistory.js"></script>-->
+ <!--<script language="javascript" src="../main/admin/js/WSRequest.js"></script>-->
+ <!--<script language="javascript" src="../main/admin/js/breadcrumbs.js"></script>-->
+ <!--<script language="javascript" src="../admin/js/cookies.js"></script>-->
<script language="javascript" src="extensions/core/js/services.js"></script>
@@ -40,7 +40,9 @@
</script>
-<div id="middle">
+<jsp:include page="display-messages.jsp"/>
+
+<div id="middle">
<!--
<div id="breadcrumbDiv" style="display:inline;"></div>
<div id="divListTransports" style="display:none;"></div>
@@ -157,13 +159,13 @@
<div id="divListServiceData" style="display:none;"></div>
-<div id="alertMessageBox" style="display:none;position:absolute;z-index: 600;">
- <!--the message area-->
- <p id="alertMessageBoxMessageArea"></p>
- <!-- the button area-->
- <p id="alertButton" align="right">
- <input id="alertBoxButton" type="button"
- value=" OK "
- onclick="document.getElementById('alertMessageBox').style.display='none';return false;"/>
- </p>
-</div>
\ No newline at end of file
+<%--<div id="alertMessageBox" style="display:none;position:absolute;z-index: 600;">--%>
+ <%--<!--the message area-->--%>
+ <%--<p id="alertMessageBoxMessageArea"></p>--%>
+ <%--<!-- the button area-->--%>
+ <%--<p id="alertButton" align="right">--%>
+ <%--<input id="alertBoxButton" type="button"--%>
+ <%--value=" OK "--%>
+ <%--onclick="document.getElementById('alertMessageBox').style.display='none';return false;"/>--%>
+ <%--</p>--%>
+<%--</div>--%>
\ No newline at end of file
More information about the Carbon-dev
mailing list