[wsas-java-dev] svn commit r3868 - in
trunk/wsas/java/modules/www/extensions/core: js xslt
svn at wso2.org
svn at wso2.org
Fri Jun 15 06:15:27 PDT 2007
Author: saminda
Date: Fri Jun 15 06:15:13 2007
New Revision: 3868
Modified:
trunk/wsas/java/modules/www/extensions/core/js/data_service.js
trunk/wsas/java/modules/www/extensions/core/js/logview.js
trunk/wsas/java/modules/www/extensions/core/js/system.js
trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
Log:
Updates
Modified: trunk/wsas/java/modules/www/extensions/core/js/data_service.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/data_service.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/data_service.js Fri Jun 15 06:15:13 2007
@@ -21,13 +21,33 @@
serviceSpecificName = tempValue;
curDataServiceName = tempValue; // TODO : This needs to be removed when cleaning up.
- var newDataObject = document.createElement("return");
-
-
- var dataRowObj = document.createElement("data");
+
+ var browser = wso2.wsf.Util.getBrowser();
+
+ switch (browser) {
+ case "ie":
+ case "ie7": {
+ newDataObject = new ActiveXObject("Microsoft.XMLDOM");
+ var wrapperEle = "<return></return>"
+ domDoc.load(wrapperEle);
+ break;
+ }
+ case "gecko":
+ case "opera":
+ case "safari": {
+ newDataObject = document.implementation.createDocument("","return",null);
+ }
+ default: {
+ wso2.wsf.Util.alertWarning("DOM document can not be created");
+ return;
+ }
+
+ }
+
+ var dataRowObj = newDataObject.createElement("data");
dataRowObj.setAttribute("name", tempValue);
- var configObj = document.createElement("config");
+ var configObj = newDataObject.createElement("config");
configObj.appendChild(createPropelement("org.wso2.ws.dataservice.driver", "Fill in the Value"));
configObj.appendChild(createPropelement("org.wso2.ws.dataservice.protocol", "Fill in the Value"));
configObj.appendChild(createPropelement("org.wso2.ws.dataservice.user", "Fill in the Value"));
@@ -37,7 +57,7 @@
newDataObject.appendChild(dataRowObj);
- var tempDataServiceObj = document.createElement("temp");
+ var tempDataServiceObj = newDataObject.createElement("temp");
tempDataServiceObj.appendChild(newDataObject);
addNewDataServiceEchoDataElement(tempDataServiceObj);
}
@@ -100,7 +120,7 @@
var sqlObj = dataServiceQueryObj.getElementsByTagName("sql").item(0);
sqlObj.removeChild(sqlObj.childNodes.item(0));
- sqlObj.appendChild(document.createTextNode(dataServiceSQL));
+ sqlObj.appendChild(newDataObject.createTextNode(dataServiceSQL));
var resultObj = dataServiceQueryObj.getElementsByTagName("result").item(0);
resultObj.setAttribute("element", dataServiceWrapElement);
@@ -217,44 +237,38 @@
}
function createOpElement(opName, queryName){
- var opObj = document.createElement("operation");
+ var opObj = newDataObject.createElement("operation");
opObj.setAttribute("name", opName);
- var queryObj = document.createElement("call-query")
+ var queryObj = newDataObject.createElement("call-query")
queryObj.setAttribute("href", queryName);
opObj.appendChild(queryObj);
return opObj;
}
function createPropelement(propName, propValue){
- var propObj = document.createElement("property");
- propObj.appendChild(document.createTextNode(propValue));
+ var propObj = newDataObject.createElement("property");
+ propObj.appendChild(newDataObject.createTextNode(propValue));
propObj.setAttribute("name", propName);
return propObj;
}
function createInputMappingElement(elementName, sqlType){
- var imElement = document.createElement("param");
+ var imElement = newDataObject.createElement("param");
imElement.setAttribute("name", elementName);
imElement.setAttribute("sqlType", sqlType);
return imElement;
}
-function createOutputMappingElement(elementName, columnName){
- var imElement = document.createElement("element");
- imElement.setAttribute("name", elementName);
- imElement.setAttribute("column", columnName);
- return imElement;
-}
function createOutputMappingElement(elementName, dataColumn){
- var imElement = document.createElement("element");
+ var imElement = newDataObject.createElement("element");
imElement.setAttribute("name", elementName);
imElement.setAttribute("column", dataColumn);
return imElement;
}
function createOutputMappingQuery(queryName){
- var imElement = document.createElement("call-query");
+ var imElement = newDataObject.createElement("call-query");
imElement.setAttribute("href", queryName);
return imElement;
}
@@ -262,13 +276,13 @@
function configPropertyOnChange(propName, propValue) {
var propObj = getNodeWithPropertyFromCollection(dataServiceObj.getElementsByTagName("property"), "name", propName);
propObj.removeChild(propObj.firstChild);
- propObj.appendChild(document.createTextNode(propValue));
+ propObj.appendChild(newDataObject.createTextNode(propValue));
}
function querySQLOnChange(sqlStatement){
var sqlObj = dataServiceQueryObj.getElementsByTagName("sql").item(0);
sqlObj.removeChild(sqlObj.childNodes.item(0));
- sqlObj.appendChild(document.createTextNode(sqlStatement));
+ sqlObj.appendChild(newDataObject.createTextNode(sqlStatement));
}
function queryWENOnChange(WEN){
@@ -313,12 +327,12 @@
return false;
}
- var queryEle = document.createElement("query");
+ var queryEle = newDataObject.createElement("query");
queryEle.setAttribute("id", tempValue);
- var sqlEle = document.createElement("sql");
- sqlEle.appendChild(document.createTextNode(""));
- var resultEle = document.createElement("result");
+ var sqlEle = newDataObject.createElement("sql");
+ sqlEle.appendChild(newDataObject.createTextNode(""));
+ var resultEle = newDataObject.createElement("result");
resultEle.setAttribute("element", "element");
Modified: trunk/wsas/java/modules/www/extensions/core/js/logview.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/logview.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/logview.js Fri Jun 15 06:15:13 2007
@@ -10,9 +10,6 @@
var ERROR_color = "#F7B761";
var FATAL_color = "#EA8823";
-var showDivViewLogsInterval = 0;
-var showDivViewLogs = false;
-
var VIWE_LOGS_REFRESHING_TIME= 10000; //Default refreshing time is every 10 Sec
function showViewLogs(thisObj,index) {
@@ -24,12 +21,6 @@
//initial firing
viewLogs();
- /* Refreshing of logs have been removed due request by users.
- if (showDivViewLogsInterval == 0) {
- showDivViewLogsInterval = setInterval('viewLogs()',VIWE_LOGS_REFRESHING_TIME);
- }*/
-
-
}
function viewLogs() {
@@ -40,16 +31,6 @@
'</ns1:getLogsRequest>';
var callURL = serverURL + "/" + LOGGING_SERVICE_STRING + "/" + "getLogs";
-
- if (document.getElementById("viewLogs").style.display == 'none' &&
- showDivViewLogs) {
- showDivViewLogs = false;
- clearInterval(showDivViewLogsInterval);
- showDivViewLogsInterval = 0;
- // this is to counter if focus to divStatistics is vanished.
- return false;
-
- }
new wso2.wsf.WSRequest(callURL,"getLogs",body_xml,viewLogsCallback);
}
@@ -76,9 +57,6 @@
strHTML += "</div></fieldset></form></div>"
objDiv.innerHTML = strHTML;
wso2.wsf.Util.showOnlyOneMain(objDiv);
-
- showDivViewLogs = true;
-
}
function getLogLineColor(str_line_type){
Modified: trunk/wsas/java/modules/www/extensions/core/js/system.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/system.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/system.js Fri Jun 15 06:15:13 2007
@@ -72,38 +72,9 @@
});
}
-
-
-function stoppingRefreshingMethodsHook() {
- // initializing the showDiv variable
- clearInterval(showHomeInterval);
- showDivHome = false;
- showHomeInterval = 0;
- clearInterval(showDivInterval);
- showDivStatistics = false;
- showDivInterval = 0;
- // stoping refreshing methods from listService and listServiceGroup
- clearInterval(listServiceDataRequestInterval);
- showListServiceDataDiv = false;
- listServiceDataRequestInterval = 0;
-
- clearInterval(listServiceGroupsRequestInterval);
- showListServcieGroupDiv = false;
- listServiceGroupsRequestInterval = 0;
-
- //stop refresing for viewLogs
- clearInterval(showDivViewLogsInterval);
- showDivViewLogs = false;
- showDivViewLogsInterval = 0;
-
- clearInterval(showGraphDivInterval);
- showGraphDivHome = false;
- showGraphDivInterval = 0;
-}
-
function storeCurMenu(thisObj, index) {
if (thisObj && index) {
renderSelectedMenuItem(thisObj,index);
gatherHistoryObject(thisObj.id, index);
}
-}
+}
\ No newline at end of file
Modified: trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js Fri Jun 15 06:15:13 2007
@@ -202,10 +202,7 @@
// This is must
lastHash = newLocation;
- if (actDivName.indexOf("viewLogs") > -1 && shouldDisplay) {
- showViewLogs();
-
- } else if (actDivName.indexOf("divListServiceGroups") > -1 && shouldDisplay) {
+ if (actDivName.indexOf("divListServiceGroups") > -1 && shouldDisplay) {
startServices();
} else if (actDivName.indexOf("divStatistics") > -1 && shouldDisplay) {
@@ -234,4 +231,28 @@
} else {
return true;
}
+}
+/**
+ * stoppingRefreshingMethodsHook is an hook.
+ */
+function stoppingRefreshingMethodsHook() {
+ // initializing the showDiv variable
+ clearInterval(showHomeInterval);
+ showDivHome = false;
+ showHomeInterval = 0;
+ clearInterval(showDivInterval);
+ showDivStatistics = false;
+ showDivInterval = 0;
+ // stoping refreshing methods from listService and listServiceGroup
+ clearInterval(listServiceDataRequestInterval);
+ showListServiceDataDiv = false;
+ listServiceDataRequestInterval = 0;
+
+ clearInterval(listServiceGroupsRequestInterval);
+ showListServcieGroupDiv = false;
+ listServiceGroupsRequestInterval = 0;
+
+ clearInterval(showGraphDivInterval);
+ showGraphDivHome = false;
+ showGraphDivInterval = 0;
}
\ No newline at end of file
Modified: trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl (original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/list_services_info.xsl Fri Jun 15 06:15:13 2007
@@ -54,14 +54,14 @@
<td style="width: 200px;">
<a>
<xsl:attribute name="href">#</xsl:attribute>
- <xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?wsdl');return false;</xsl:attribute>
+ <xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?wsdl&annotation=true');return false;</xsl:attribute>
<xsl:attribute name="target">_blank</xsl:attribute>
<xsl:text>WSDL 1.1</xsl:text>
</a>
<xsl:text>  </xsl:text>
<a>
<xsl:attribute name="href">#</xsl:attribute>
- <xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?wsdl2');return false;</xsl:attribute>
+ <xsl:attribute name="onClick">javascript:openWindowHTTP('<xsl:value-of select="."/>?wsdl2&annotation=true');return false;</xsl:attribute>
<xsl:attribute name="target">_blank</xsl:attribute>
<xsl:text>WSDL 2.0</xsl:text>
</a>
More information about the Wsas-java-dev
mailing list