Author: tyrell
Date: Mon Jul 14 04:35:24 2008
New Revision: 19244
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19244
Log:
Fixing a YUI version related bug
Added:
trunk/mashup/java/modules/www/create_ds.jsp
- copied, changed from r19203,
/trunk/mashup/java/modules/www/data_services.jsp
trunk/mashup/java/modules/www/edit_ds.jsp
Removed:
trunk/mashup/java/modules/www/data_services.jsp
Modified:
trunk/mashup/java/modules/www/taskbar.jsp
Copied: trunk/mashup/java/modules/www/create_ds.jsp (from r19203,
/trunk/mashup/java/modules/www/data_services.jsp)
URL:
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/create_ds.jsp?rev=19244&r1=19203&r2=19244&view=diff
==============================================================================
--- /trunk/mashup/java/modules/www/data_services.jsp (original)
+++ trunk/mashup/java/modules/www/create_ds.jsp Mon Jul 14 04:35:24 2008
@@ -35,39 +35,48 @@
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
- <link href="extensions/core/css/ds-styles.css" rel="stylesheet"
type="text/css"/>
+ <link href="extensions/core/css/styles.css" rel="stylesheet"
type="text/css"/>
+ <link
href="../wsasadmin/extensions/yui/build/container/assets/container.css"
rel="stylesheet"
+ type="text/css" media="all"/>
<!-- Required Javascript -->
- <link href="../wsasadmin/extensions/admin/css/common.css" rel="stylesheet"
type="text/css" media="all"/>
- <link
href="../wsasadmin/extensions/yui/build/container/assets/container.css"
rel="stylesheet" type="text/css"
- media="all"/>
-
+ <script language="javascript" src="../wsasadmin/global_params.js"></script>
+ <script language="javascript" src="js/main.js"></script>
+ <script language="javascript"
src="../wsasadmin/js/dhtmlHistory.js"></script>
<script language="javascript"
src="../wsasadmin/extensions/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>
- <script language="javascript"
src="../wsasadmin/extensions/yui/build/dragdrop/dragdrop.js"></script>
- <script language="javascript"
src="../wsasadmin/extensions/yui/build/container/container-min.js"></script>
- <script language="javascript" src="../wsasadmin/global-params.js"></script>
- <script language="javascript" src="../wsasadmin/js/main.js"></script>
- <script language="javascript"
src="../wsasadmin/js/dhtmlHistory.js"></script>
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/dragdrop/dragdrop.js"></script>
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/container/container-min.js"></script>
+
+ <script language="javascript" src="js/common.js"></script>
<script language="javascript" src="js/wso2/WSRequest.js"></script>
<script language="javascript" src="extensions/yui/js/yui.js"></script>
- <script language="javascript" src="extensions/core/js/main.js"></script>
<script language="javascript"
src="extensions/core/js/data_service.js"></script>
<script language="JavaScript" type="text/javascript">
-
function init() {
wso2.wsf.Util.initURLs();
+ var len = ROOT_CONTEXT.length;
+ var position = eval(len - 1);
+ var lastChar = ROOT_CONTEXT.substring(position, len);
+ var path;
+ if (lastChar == "/") {
+ path = ROOT_CONTEXT + SERVICE_PATH;
+ } else {
+ path = ROOT_CONTEXT + "/" + SERVICE_PATH;
+ }
+ serverURL = self.location.protocol + "//" + self.location.hostname
+ ":" +
+ self.location.port + path;
+
/*Initialize the XSLT cache*/
wso2.wsf.XSLTHelper.init();
- }
- function showServiceInitializer(){
- location.reload(true);
+ addNewDataService();
}
-
</script>
</head>
@@ -79,25 +88,11 @@
<%@ include file="header.jsp" %>
<%@ include file="searchbox.jsp" %>
- <div id="content">
-
- <div id="left">
- <ul class="menu">
- <li class="home"><a href="index.html">Home</a></li>
- <li><a href="#" onclick="addNewDataService(); return false;">
- <nobr>New Data
- Service
- </nobr>
- </a></li>
- <li><a href="#" onclick="alert('TODO. Copy the code from
WSAS'); return false;">
- <nobr>Edit
- Data Services
- </nobr>
- </a></li>
- <li class="bottom"> </li>
- </ul>
- </div>
+ <!--Importing again to prevent version conflicts-->
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+ <div id="content">
<div id="divYUIPaneHolder" style="z-index:500;"></div>
<div id="divDSAddQuery" style="z-index:500;"></div>
<div id="divADDEditInputMapping" style="z-index:500;"></div>
@@ -112,7 +107,7 @@
<div id="divDataServiceDisplayConfig" style="display:none;"></div>
</div>
<%@ include file="footer.jsp" %>
-
+
</div>
Deleted: trunk/mashup/java/modules/www/data_services.jsp
URL: http://wso2.org/svn/browse/wso2/None?pathrev=19243
Added: trunk/mashup/java/modules/www/edit_ds.jsp
URL:
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/edit_ds.jsp?pathrev=19244
==============================================================================
--- (empty file)
+++ trunk/mashup/java/modules/www/edit_ds.jsp Mon Jul 14 04:35:24 2008
@@ -0,0 +1,129 @@
+<%--
+ * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org
+ *
+ * Licensed 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.
+--%>
+<%@ page errorPage="error.jsp" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+
+<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ String thisPage = "edit_ds.jsp";
+ String currentUser = RegistryUtils.getCurrentUser(userRegistry);
+
+ String serviceName = request.getParameter("serviceName");
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html>
+<head>
+
+ <title><%= bundle.getString("main.title")%> - Manage Data Services</title>
+
+ <!-- Required CSS -->
+ <link href="css/styles.css" rel="stylesheet" type="text/css"/>
+ <link href="extensions/core/css/styles.css" rel="stylesheet"
type="text/css"/>
+
+ <!-- Required Javascript -->
+ <link
href="../wsasadmin/extensions/yui/build/container/assets/container.css"
rel="stylesheet"
+ type="text/css"
+ media="all"/>
+
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/dragdrop/dragdrop.js"></script>
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/container/container-min.js"></script>
+ <script language="javascript" src="../wsasadmin/global_params.js"></script>
+ <script language="javascript" src="../wsasadmin/js/main.js"></script>
+ <script language="javascript"
src="../wsasadmin/js/dhtmlHistory.js"></script>
+ <script language="javascript" src="js/common.js"></script>
+ <script language="javascript" src="js/wso2/WSRequest.js"></script>
+ <script language="javascript" src="extensions/yui/js/yui.js"></script>
+ <script language="javascript"
src="extensions/core/js/data_service.js"></script>
+
+ <script language="JavaScript" type="text/javascript">
+ function init() {
+ wso2.wsf.Util.initURLs();
+
+ var path;
+ if (lastChar == "/") {
+ path = ROOT_CONTEXT + SERVICE_PATH;
+ } else {
+ path = ROOT_CONTEXT + "/" + SERVICE_PATH;
+ }
+ serverURL = self.location.protocol + "//" + self.location.hostname
+ ":" +
+ self.location.port + path;
+
+
+ /*Initialize the XSLT cache*/
+ wso2.wsf.XSLTHelper.init();
+
+ configureDataservice('<%=serviceName%>');
+ }
+ </script>
+
+</head>
+
+<body onload="init();">
+
+<div id="page">
+
+ <%@ include file="header.jsp" %>
+ <%@ include file="searchbox.jsp" %>
+
+ <!--Importing again to prevent version conflicts-->
+ <script language="javascript"
+
src="../wsasadmin/extensions/yui/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+
+ <div id="content">
+ <div id="divYUIPaneHolder" style="z-index:500;"></div>
+ <div id="divDSAddQuery" style="z-index:500;"></div>
+ <div id="divADDEditInputMapping" style="z-index:500;"></div>
+ <div id="divADDEditOutputMapping" style="z-index:500;"></div>
+ <div id="divDSAddEditOperations" style="z-index:500;"></div>
+ <div id="divDSAddEditOperationsQuery" style="z-index:500;"></div>
+
+ <div id="divDataServiceDetails" style="display:none;"></div>
+ <div id="divDataServiceAddOperation" style="display:none;"></div>
+ <div id="divDataServiceAddQuery" style="display:none;"></div>
+ <div id="divDataServiceAddOutput" style="display:none;"></div>
+ <div id="divDataServiceDisplayConfig" style="display:none;"></div>
+
+ <div id="divEditDataServices" style="display:none;"></div>
+ </div>
+ <%@ include file="footer.jsp" %>
+
+</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>
+
+</body>
+
+</html>
\ No newline at end of file
Modified: trunk/mashup/java/modules/www/taskbar.jsp
URL:
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=19244&r1=19243&r2=19244&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Mon Jul 14 04:35:24 2008
@@ -191,7 +191,7 @@
</li>
<li>
- <a href="data_services.jsp">Manage Data Services</a>
+ <a href="create_ds.jsp">Create a new Data Service</a>
</li>
<script type="text/javascript">
_______________________________________________
Mashup-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev
