[wsas-java-dev] svn commit r3453 - in trunk/wsas/java/modules/www/extensions/core: js xslt

svn at wso2.org svn at wso2.org
Fri Jun 1 07:45:38 PDT 2007


Author: saminda
Date: Fri Jun  1 07:45:22 2007
New Revision: 3453

Modified:
   trunk/wsas/java/modules/www/extensions/core/js/breadcrumbs.js
   trunk/wsas/java/modules/www/extensions/core/js/crypto.js
   trunk/wsas/java/modules/www/extensions/core/js/data_service.js
   trunk/wsas/java/modules/www/extensions/core/js/keystore.js
   trunk/wsas/java/modules/www/extensions/core/js/logconfig.js
   trunk/wsas/java/modules/www/extensions/core/js/modules.js
   trunk/wsas/java/modules/www/extensions/core/js/rampart_config.js
   trunk/wsas/java/modules/www/extensions/core/js/registration.js
   trunk/wsas/java/modules/www/extensions/core/js/servicegroup.js
   trunk/wsas/java/modules/www/extensions/core/js/services.js
   trunk/wsas/java/modules/www/extensions/core/js/system.js
   trunk/wsas/java/modules/www/extensions/core/js/tracer.js
   trunk/wsas/java/modules/www/extensions/core/js/transports.js
   trunk/wsas/java/modules/www/extensions/core/js/users.js
   trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
   trunk/wsas/java/modules/www/extensions/core/xslt/list_services.xsl
   trunk/wsas/java/modules/www/extensions/core/xslt/modules.xsl
Log:
Update to sync with new API


Modified: trunk/wsas/java/modules/www/extensions/core/js/breadcrumbs.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/breadcrumbs.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/breadcrumbs.js	Fri Jun  1 07:45:22 2007
@@ -160,7 +160,7 @@
                                            if (!newDataService) {
                                            		_text += "listServiceData('"+ getServiceSpecificName() +"')";
                                            } else {
-                                           		_text += "alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
+                                           		_text += "wso2.wsf.Util.alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
                                            }
                                            _text += "; return false;\">"+ getServiceSpecificName() + "</a>&nbsp;&gt;&nbsp;" +"Configure Data Service" +"</h4>";
     _updateDiv.innerHTML = _text;
@@ -172,7 +172,7 @@
                                            if (!newDataService) {
                                            		_text += "listServiceData('"+ getServiceSpecificName() +"')";
                                            } else {
-                                           		_text += "alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
+                                           		_text += "wso2.wsf.Util.alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
                                            }
                                            _text += " return false;\">"+ getServiceSpecificName() + "</a>&nbsp;&gt;&nbsp;" +
                                            
@@ -186,7 +186,7 @@
                                            if (!newDataService) {
                                            		_text += "listServiceData('"+ getServiceSpecificName() +"')";
                                            } else {
-                                           		_text += "alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
+                                           		_text += "wso2.wsf.Util.alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
                                            }
                                            _text += "; return false;\">"+ getServiceSpecificName() + "</a>&nbsp;&gt;&nbsp;" +
                                            "<a href=\"#\" onClick=\"javascript:refreshDataServiceScreen(); return false;\">Configure Data Service</a>&nbsp;&gt;&nbsp;" +"Service Query" +"</h4>";
@@ -199,7 +199,7 @@
                                            if (!newDataService) {
                                            		_text += "listServiceData('"+ getServiceSpecificName() +"')";
                                            } else {
-                                           		_text += "alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
+                                           		_text += "wso2.wsf.Util.alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
                                            }
                                            _text +="; return false;\">"+ getServiceSpecificName() + "</a>&nbsp;&gt;&nbsp;" +
                                            "<a href=\"#\" onClick=\"javascript:refreshDataServiceScreen(); return false;\">Configure Data Service</a>&nbsp;&gt;&nbsp;" +"Review and Save" +"</h4>";
@@ -212,7 +212,7 @@
 										   if (!newDataService) {
                                            		_text += "listServiceData('"+ getServiceSpecificName() +"')";
                                            } else {
-                                           		_text += "alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
+                                           		_text += "wso2.wsf.Util.alertInternal('" + newDataServiceMenuMessage + "', INFORMATION_MESSAGE)";
                                            }
                                            _text += "; return false;\">"+ getServiceSpecificName() + "</a>&nbsp;&gt;&nbsp;" +
                                            "<a href=\"#\" onClick=\"javascript:refreshDataServiceScreen(); return false;\">Configure Data Service</a>&nbsp;&gt;&nbsp;" +"Add Output Mapping" +"</h4>";

Modified: trunk/wsas/java/modules/www/extensions/core/js/crypto.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/crypto.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/crypto.js	Fri Jun  1 07:45:22 2007
@@ -142,7 +142,7 @@
 
 function validateimportCertificate() {
     if (wso2.wsf.Util.trim(document.certificateupload.certificateFile.value) == "") {
-        alertWarning("Please select a certificate file.");
+        wso2.wsf.Util.alertWarning("Please select a certificate file.");
         return false;
     }
     /*setting the callback method*/
@@ -167,7 +167,7 @@
     var data = this.req.responseXML;
     var returnStatus = data.getElementsByTagName("return")[0].firstChild.nodeValue;
 
-    alertMessage(returnStatus);
+    wso2.wsf.Util.alertMessage(returnStatus);
     //calling the main
     keystoreSetting();
 

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  1 07:45:22 2007
@@ -109,7 +109,7 @@
 }
 
 function addConfigParameter(){
-	var newParam = getUserInput();
+	var newParam = wso2.wsf.Util.getUserInput();
     if (newParam != null) {
     	dataServiceObj.getElementsByTagName("config").item(0).appendChild(createPropelement(newParam[0], newParam[1]));
     }
@@ -117,7 +117,7 @@
 }
 
 function addNewInputMapping(){
-	var newParam = getUserInputCustum("Please enter the Input Mapping name", "Please enter the SQL Type", false);
+	var newParam = wso2.wsf.Util.getUserInputCustum("Please enter the Input Mapping name", "Please enter the SQL Type", false);
     if (newParam != null) {
     	dataServiceQueryObj.appendChild(createInputMappingElement(newParam[0], newParam[1]));
     }

Modified: trunk/wsas/java/modules/www/extensions/core/js/keystore.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/keystore.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/keystore.js	Fri Jun  1 07:45:22 2007
@@ -67,17 +67,17 @@
 
 function validate(){
    if(wso2.wsf.Util.trim(document.keysotoreupload.keystoreFile.value) == ""){
-       alertWarning("Please select a keystore file.");
+       wso2.wsf.Util.alertWarning("Please select a keystore file.");
        return false;
    }
    var ksPassword = wso2.wsf.Util.trim(document.getElementById("ksPassword").value);
    if(ksPassword==""){
-       alertWarning("Please enter the key store password.");
+       wso2.wsf.Util.alertWarning("Please enter the key store password.");
        return false;
    }
    var reenteredKsPassword = wso2.wsf.Util.trim(document.getElementById("reEnteredKsPassword").value);
    if(ksPassword != reenteredKsPassword){
-       alertWarning("The Key store passwords do not match.");
+       wso2.wsf.Util.alertWarning("The Key store passwords do not match.");
        return false;
    }
    KEYSTORE_PASSWORD = ksPassword;
@@ -149,7 +149,7 @@
         }
 
         if (objRadio[i] == (objRadio.length - 1)) {
-            alertWarning("Please select a private key.");
+            wso2.wsf.Util.alertWarning("Please select a private key.");
         }
     }
     if (checkedRadioObj) {
@@ -160,7 +160,7 @@
 
 function finishKeystoreSetting(pass,repass) {
     if (pass.value != repass.value) {
-        alertMessage("The passwords do not match");
+        wso2.wsf.Util.alertMessage("The passwords do not match");
         return false;
     }
     PRIVATE_KEY_PASSWORD = pass.value;
@@ -211,7 +211,7 @@
 
 function deleteKeyStoreCallback() {
 
-    showResponseMessage(this.req);
+    wso2.wsf.Util.showResponseMessage(this.req);
     //loading the firstpage
     keystoreSetting();
 }

Modified: trunk/wsas/java/modules/www/extensions/core/js/logconfig.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/logconfig.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/logconfig.js	Fri Jun  1 07:45:22 2007
@@ -140,7 +140,7 @@
     var callURL = serverURL + "/" + "LoggingAdmin" ;
 
     if (appenderName == "WSO2WSAS_LOGFILE" && wso2.wsf.Util.trim(logFileInputBox.value) == "") {
-        alertWarning("Please specify a valid log file.");
+        wso2.wsf.Util.alertWarning("Please specify a valid log file.");
         return;
     }
 
@@ -158,7 +158,7 @@
 }
 
 function storeAppenderDataCallBack() {
-    alertMessage("Successfully updated appender data.")
+    wso2.wsf.Util.alertMessage("Successfully updated appender data.")
 }
 
 function storeLoggerData() {
@@ -178,7 +178,7 @@
 }
 
 function storeLoggerDataCallBack() {
-    alertMessage("Successfully updated logger data.");
+    wso2.wsf.Util.alertMessage("Successfully updated logger data.");
 }
 
 /* Will update the log level, patern and file on the server globally. */
@@ -221,7 +221,7 @@
         }
     }
 
-    alertMessage("Global logging configuration successfully updated.");
+    wso2.wsf.Util.alertMessage("Global logging configuration successfully updated.");
 }
 
 function restoreDefaults() {
@@ -236,7 +236,7 @@
 
 function restoreDefaultsCallback() {
 
-    alertMessage("Successfully restored default logging configuration.");
+    wso2.wsf.Util.alertMessage("Successfully restored default logging configuration.");
     systemLogConfig();
 
 }
\ No newline at end of file

Modified: trunk/wsas/java/modules/www/extensions/core/js/modules.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/modules.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/modules.js	Fri Jun  1 07:45:22 2007
@@ -21,7 +21,7 @@
     var data = this.req.responseXML;
     var text = data.getElementsByTagName('return')[0];
 
-    alertMessage(text.firstChild.nodeValue);
+    wso2.wsf.Util.alertMessage(text.firstChild.nodeValue);
     listModules();
 }
 
@@ -41,7 +41,7 @@
 }
 
 function disengageModuleForSystemCallback() {
-    alertMessage("Module was globally disengaged successfuly.");
+    wso2.wsf.Util.alertMessage("Module was globally disengaged successfuly.");
     listModules();
 }
 
@@ -144,7 +144,7 @@
 
 function processMultipleModuleConfigEntryCallback() {
 
-    alertMessage("Module parameters were successfully updated.");
+    wso2.wsf.Util.alertMessage("Module parameters were successfully updated.");
 
     getModuleParametersForConfig(getLastUsedModuleId(), getLastUsedModuleVersion());
 }
@@ -152,7 +152,7 @@
 function processSingleModuleConfigEntry(moduleid, moduleVersion, itemName, itemValue, callback) {
 
     if (!parseParameterName(itemName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -176,7 +176,7 @@
 
 //add a new module parameter
 function addModuleParameter() {
-    var newParam = getUserInput();
+    var newParam = wso2.wsf.Util.getUserInput();
     if (newParam != null) {
         processSingleModuleConfigEntry(
                 getLastUsedModuleId(),
@@ -198,7 +198,7 @@
 function processSingleModuleConfigEntryRemoval(moduleid, moduleVersion, itemName, callback) {
 
     if (!parseParameterName(itemName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 

Modified: trunk/wsas/java/modules/www/extensions/core/js/rampart_config.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/rampart_config.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/rampart_config.js	Fri Jun  1 07:45:22 2007
@@ -78,12 +78,12 @@
             }
 
         } else {
-            alertWarning("Problem encountered in javascript");
+            wso2.wsf.Util.alertWarning("Problem encountered in javascript");
             return false;
         }
 
         if (!isChecked) {
-            alertMessage("Please select a scenario");
+            wso2.wsf.Util.alertMessage("Please select a scenario");
             return false;
         }
         //Execute with proper params
@@ -233,7 +233,7 @@
     }
 
     if (!usersChecked && !rolesChecked) {
-        alertMessage("Please select at least one user or a role");
+        wso2.wsf.Util.alertMessage("Please select at least one user or a role");
         return false;
     }
     if (usersChecked && !rolesChecked) {
@@ -259,7 +259,7 @@
 
 function assignUsersAndRolesCallback() {
 
-    alertMessage("Security scenario successfully applied");
+    wso2.wsf.Util.alertMessage("Security scenario successfully applied");
     
     showSecurityConfigurationInfo();
 
@@ -438,7 +438,7 @@
     var privateKeystoreSelectObjValue = privateKeystoreSelectObj[privateKeystoreSelectObj.selectedIndex].value;
 
     if ((certificateStoresCheckboxObj == null) || (privateKeystoreSelectObj == null)) {
-        alertWarning("Either trusted certificate stores or private keystores not available ");
+        wso2.wsf.Util.alertWarning("Either trusted certificate stores or private keystores not available ");
     }
     var trustedCertStores = "";
     var certificateStoresCheckboxObjLength = certificateStoresCheckboxObj.length;
@@ -453,7 +453,7 @@
     }
 
     if (!isCertificateStoresCheckboxObj) {
-        alertMessage("Please select at least one Trusted Certificate Store");
+        wso2.wsf.Util.alertMessage("Please select at least one Trusted Certificate Store");
         return false;
     }
 
@@ -471,7 +471,7 @@
 
 function assignKeyStoresCallback() {
 
-    alertMessage("Security scenario successfully applied");
+    wso2.wsf.Util.alertMessage("Security scenario successfully applied");
     showSecurityConfigurationInfo();
 }
 
@@ -490,7 +490,7 @@
 
 function DisableSecurityCallback() {
 
-    alertMessage("Security has been disabled for service [" + getServiceSpecificName() + "]");
+    wso2.wsf.Util.alertMessage("Security has been disabled for service [" + getServiceSpecificName() + "]");
     showSecurityConfigurationInfo();
 }
 

Modified: trunk/wsas/java/modules/www/extensions/core/js/registration.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/registration.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/registration.js	Fri Jun  1 07:45:22 2007
@@ -64,7 +64,7 @@
 
 function sendRegistrationInfo(){
 	if (document.getElementById('registerProductPassword1').value != document.getElementById('registerProductPassword2').value){
-		alertWarning("Passwords entered do not match.");
+		wso2.wsf.Util.alertWarning("Passwords entered do not match.");
 		return false;
 	}
     reportRegisterProduct();

Modified: trunk/wsas/java/modules/www/extensions/core/js/servicegroup.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/servicegroup.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/servicegroup.js	Fri Jun  1 07:45:22 2007
@@ -56,7 +56,7 @@
 }
 
 function addServiceGroupParameter() {
-    var newParam = getUserInput();
+    var newParam = wso2.wsf.Util.getUserInput();
     if (newParam != null) {
         processSingleOperationParameterConfigEntrySG(moduleServiceGroupName,
                 newParam[0],
@@ -74,7 +74,7 @@
 		 callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -113,7 +113,7 @@
 
 function processMultipleOperationParameterConfigEntrySGCallback() {
 
-    alertMessage("Service group parameters were successfully updated.");
+    wso2.wsf.Util.alertMessage("Service group parameters were successfully updated.");
 
     getServiceGroupSpecificParametersForConfig(moduleServiceGroupName);
 
@@ -124,7 +124,7 @@
                                                       parameterValue, callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -285,7 +285,7 @@
     var data = this.req.responseXML;
     var text = data.getElementsByTagName('return')[0];
 
-    alertMessage(text.firstChild.nodeValue);
+    wso2.wsf.Util.alertMessage(text.firstChild.nodeValue);
 
     setTimeout(function() {engageModulePerServiceGroup(moduleServiceGroupName);},1000);
 
@@ -316,7 +316,7 @@
 
 function disengageModuelfromServiceGroupExecCallback() {
 
-    alertMessage("Module was disengaged from service successfully.");
+    wso2.wsf.Util.alertMessage("Module was disengaged from service successfully.");
     setTimeout(function() {engageModulePerServiceGroup(moduleServiceGroupName);},1000);
 
 }

Modified: trunk/wsas/java/modules/www/extensions/core/js/services.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/services.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/services.js	Fri Jun  1 07:45:22 2007
@@ -159,7 +159,7 @@
 }
 function showAARGenerationCompleteMsg(msg) {
     wso2.wsf.Util.cursorClear();
-    alertMessage(msg);
+    wso2.wsf.Util.alertMessage(msg);
     showServiceInitializer();
 }
 
@@ -421,7 +421,7 @@
     var data = this.req.responseXML;
     var text = data.getElementsByTagName('return')[0];
 
-    alertMessage(text.firstChild.nodeValue);
+    wso2.wsf.Util.alertMessage(text.firstChild.nodeValue);
 
     setTimeout(function() {
         engageModulePerService(lastUsedServiceId);
@@ -517,7 +517,7 @@
 
     var callURL = serverURL + "/" + "ServiceAdmin";
     new wso2.wsf.WSRequest(callURL, "setPolicy", body_xml, function() {
-        alertMessage("Service policy successfully updated.");
+        wso2.wsf.Util.alertMessage("Service policy successfully updated.");
     });
 }
 
@@ -567,11 +567,11 @@
         stubGenerationMetaInfo();
     } else if (returnTextValue == 'false') {
         // no proecessing
-        alertMessage("Client generation could not continue due to WSDL not being available or\n" +
+        wso2.wsf.Util.alertMessage("Client generation could not continue due to WSDL not being available or\n" +
                      " the message receiver not being RPCMessageReceiver.");
 
     } else {
-        alertWarning(lable + "  Operations Couldnot be continued");
+        wso2.wsf.Util.alertWarning(lable + "  Operations Couldnot be continued");
 
     }
 
@@ -585,11 +585,11 @@
         dynamicClientGeneration();
     } else if (returnTextValue == 'false') {
         // no proecessing
-        alertMessage("DHTML generation could not continue due to WSDL not being available or\n" +
+        wso2.wsf.Util.alertMessage("DHTML generation could not continue due to WSDL not being available or\n" +
                      " the message receiver not being RPCMessageReceiver.");
 
     } else {
-        alertWarning(lable + "  Operations Couldnot be continued");
+        wso2.wsf.Util.alertWarning(lable + "  Operations Couldnot be continued");
 
     }
 
@@ -635,11 +635,11 @@
 
     var pattern = /^[a-zA-Z](([a-zA-Z_]+)([a-zA-Z0-9_]?)\.?)+[a-z0-9_]$/;
     if (packageName == null || wso2.wsf.Util.trim(packageName) == '') {
-        alertWarning("Package name is mandatory");
+        wso2.wsf.Util.alertWarning("Package name is mandatory");
         return;
     }
     if (!pattern.test(packageName)) {
-        alertWarning("Package name is not valid under Java package naming conventions");
+        wso2.wsf.Util.alertWarning("Package name is not valid under Java package naming conventions");
         return;
     }
 
@@ -880,7 +880,7 @@
 
 //add operation specific parameter
 function addOperationParameter() {
-    var newParam = getUserInput();
+    var newParam = wso2.wsf.Util.getUserInput();
     if (newParam != null) {
         processSingleOperationParameterConfigEntry(
                 lastUsedServiceId,
@@ -906,7 +906,7 @@
         parameterName, operation_callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -945,7 +945,7 @@
 
 function processMultipleOperationParameterConfigEntryCallback() {
 
-    alertMessage("Operation parameters were successfully updated.");
+    wso2.wsf.Util.alertMessage("Operation parameters were successfully updated.");
 
     getOperationSpecficParametersForConfig(getServiceOperationParameters());
 
@@ -959,7 +959,7 @@
         parameterValue, operation_callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -1143,7 +1143,7 @@
     var data = this.req.responseXML;
     var text = data.getElementsByTagName('return')[0];
 
-    alertMessage(text.firstChild.nodeValue);
+    wso2.wsf.Util.alertMessage(text.firstChild.nodeValue);
 
     engageModulePerOperation(lastOperationUsed);
 }
@@ -1175,7 +1175,7 @@
 
 function disengageModuleFromOperationCallBack() {
 
-    alertMessage("Module was disengaged from operation successfully.");
+    wso2.wsf.Util.alertMessage("Module was disengaged from operation successfully.");
     engageModulePerOperation(lastOperationUsed);
 }
 
@@ -1205,7 +1205,7 @@
 
 function disengageModuelfromServiceCallBack() {
 
-    alertMessage("Module was disengaged from service successfully.");
+    wso2.wsf.Util.alertMessage("Module was disengaged from service successfully.");
     setTimeout(function() {
         engageModulePerService(getServiceSpecificName());
     }, 1000);
@@ -1213,7 +1213,7 @@
 
 }
 function addServiceSpecificParameters() {
-    var newParam = getUserInput();
+    var newParam = wso2.wsf.Util.getUserInput();
     if (newParam != null) {
         processServiceOperationParameterConfigEntry(
                 lastUsedServiceId,
@@ -1237,7 +1237,7 @@
         parameterName, service_callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -1277,7 +1277,7 @@
 
 function processMultipleServiceOperationParameterConfigEntryCallback() {
 
-    alertMessage("Service parameters were successfully updated.");
+    wso2.wsf.Util.alertMessage("Service parameters were successfully updated.");
     getServiceSpecficParametersForConfig(lastUsedServiceId);
 
 }
@@ -1290,7 +1290,7 @@
         parameterValue, service_callback) {
 
     if (!parseParameterName(parameterName)) {
-        alertMessage("Parameter name contains an invalid character");
+        wso2.wsf.Util.alertMessage("Parameter name contains an invalid character");
         return false;
     }
 
@@ -1410,7 +1410,7 @@
         }
     }
     if (!isClassSelected) {
-        alertWarning("Please select at least one service class");
+        wso2.wsf.Util.alertWarning("Please select at least one service class");
         return;
     }
 
@@ -1633,7 +1633,7 @@
 
 function addNewTransportForServiceCallback() {
 
-    showResponseMessage(this.req);
+    wso2.wsf.Util.showResponseMessage(this.req);
     getExposedTransports(getServiceSpecificName());
 }
 
@@ -1655,7 +1655,7 @@
 
 function removeTransportBindingCallback() {
 
-    showResponseMessage(this.req);
+    wso2.wsf.Util.showResponseMessage(this.req);
     getExposedTransports(getServiceSpecificName());
 }
 
@@ -1698,7 +1698,7 @@
         }
     }
     if (!isClassSelected) {
-        alertWarning("Please select at least one Spring bean");
+        wso2.wsf.Util.alertWarning("Please select at least one Spring bean");
         return;
     }
 
@@ -1764,7 +1764,7 @@
 
 
     if (!isClassSelected) {
-        alertWarning("Please a Remote Interface Class for EJB");
+        wso2.wsf.Util.alertWarning("Please a Remote Interface Class for EJB");
         return;
     }
 

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  1 07:45:22 2007
@@ -68,7 +68,7 @@
 
     var callURL = serverURL + "/" + ADMIN_SERVER_URL ;
     new wso2.wsf.WSRequest(callURL, "save", body_xml, function() {
-        alertMessage("Server state was saved successfuly");
+        wso2.wsf.Util.alertMessage("Server state was saved successfuly");
     });
 }
 

Modified: trunk/wsas/java/modules/www/extensions/core/js/tracer.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/tracer.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/tracer.js	Fri Jun  1 07:45:22 2007
@@ -121,7 +121,7 @@
 function findMaskedObjects(findValue) {
 
     if (findValue != null && findValue.length == 0) {
-        alertMessage("Please use a string to filter");
+        wso2.wsf.Util.alertMessage("Please use a string to filter");
         return false;
     }
     var body_xml = '<req:getMessagesRequest xmlns:req="http://org.apache.axis2/xsd">\n' +

Modified: trunk/wsas/java/modules/www/extensions/core/js/transports.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/transports.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/transports.js	Fri Jun  1 07:45:22 2007
@@ -139,7 +139,7 @@
 //        addNewTransportHttps_3();
         getAllkeystoreNames();
     }else {
-        alertWarning("HTTPS Port Already Exists.\n"+
+        wso2.wsf.Util.alertWarning("HTTPS Port Already Exists.\n"+
                      "Please try another port or the System\n"+
                      "generate one.");
         addNewTrasportHTTPSPort();
@@ -188,7 +188,7 @@
         }
 
         if (objRadio[i] == (objRadio.length - 1)) {
-            alertWarning("Please select a keystore to continue.");
+            wso2.wsf.Util.alertWarning("Please select a keystore to continue.");
         }
     }
     if (checkedRadioObj) {

Modified: trunk/wsas/java/modules/www/extensions/core/js/users.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/users.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/users.js	Fri Jun  1 07:45:22 2007
@@ -127,16 +127,16 @@
     var un = currentUserName;
     var pwv = pw.value;
     if(old_pw.value == null || wso2.wsf.Util.trim(old_pw.value) == ""){
-        alertWarning("Old password cannot be empty");
+        wso2.wsf.Util.alertWarning("Old password cannot be empty");
         return false;
     }
     if (pwv  == null || wso2.wsf.Util.trim(pwv) == "") {
-        alertWarning('New Password cannot be Empty');
+        wso2.wsf.Util.alertWarning('New Password cannot be Empty');
         return false;
     }
     var pw_rev = pw_re.value;
     if (wso2.wsf.Util.trim(pwv) != wso2.wsf.Util.trim(pw_rev)) {
-        alertWarning(retyped_pw_error);
+        wso2.wsf.Util.alertWarning(retyped_pw_error);
         return false;
     }
     var body_xml = '<req:editUserPasswordRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
@@ -154,7 +154,7 @@
     var data = this.req.responseXML;
 
     if (data.getElementsByTagName("return")[0].firstChild.nodeValue == "true") {
-        alertMessage("Editing user was successful.");
+        wso2.wsf.Util.alertMessage("Editing user was successful.");
     }
     manageUser();
 }
@@ -164,10 +164,10 @@
     var data = this.req.responseXML;
 
     if (data.getElementsByTagName("return")[0].firstChild.nodeValue == "true") {
-        alertMessage("Update password was successful.");
+        wso2.wsf.Util.alertMessage("Update password was successful.");
         manageUser();
     } else {
-        alertWarning("Password update failed. Please recheck your old password.");
+        wso2.wsf.Util.alertWarning("Password update failed. Please recheck your old password.");
     }
 }
 
@@ -177,17 +177,17 @@
     var pw = password.value;
     var dp = description.value;
     if(un == null || wso2.wsf.Util.trim(un) == ""){
-        alertWarning("Please enter a valid username.");
+        wso2.wsf.Util.alertWarning("Please enter a valid username.");
         return false;
     }
     if(pw == null || wso2.wsf.Util.trim(pw) == ""){
-        alertWarning("Please enter the password.");
+        wso2.wsf.Util.alertWarning("Please enter the password.");
         return false;
     }
 
     var pw_re = password_re.value;
     if (pw != pw_re) {
-        alertWarning(retyped_pw_error);
+        wso2.wsf.Util.alertWarning(retyped_pw_error);
         return false;
     }
     var rl = role[role.selectedIndex].text;
@@ -214,7 +214,7 @@
 
 function addUserCallback() {
 
-    showResponseMessage(this.req);
+    wso2.wsf.Util.showResponseMessage(this.req);
     manageUser();
 }
 
@@ -224,9 +224,9 @@
     var text = data.getElementsByTagName('return')[0];
 
     if (text.firstChild.nodeValue == 'true'){
-        alertMessage("User role was added successfully.");
+        wso2.wsf.Util.alertMessage("User role was added successfully.");
     }else {
-        alertWarning("User role already exists.");
+        wso2.wsf.Util.alertWarning("User role already exists.");
     }
     manageRole();
 }
@@ -235,7 +235,7 @@
     var rolename = role.value;
     var roleDescription = description.value;
     if(rolename == null || wso2.wsf.Util.trim(rolename) == ""){
-        alertWarning("Please enter a valid Role name.");
+        wso2.wsf.Util.alertWarning("Please enter a valid Role name.");
         return false;
     }
     if(roleDescription == null || wso2.wsf.Util.trim(roleDescription) == ""){
@@ -254,7 +254,7 @@
 //        send("addRole", body_xml, xsltFileName, callURL, document.getElementById("divAddRole"), false, addRoleCallBack);
         new wso2.wsf.WSRequest(callURL,"addRole",body_xml,addRoleCallBack);
     } else {
-        alertWarning("Please specify the user role to add.");
+        wso2.wsf.Util.alertWarning("Please specify the user role to add.");
     }
 
     //refresh page
@@ -312,7 +312,7 @@
     user = user.replace(/\xA7/g,"'");
 
     if (user == 'admin') {
-        alertWarning("You cannot delete the default admin account!");
+        wso2.wsf.Util.alertWarning("You cannot delete the default admin account!");
         return false;
     }
     var deleteIt= confirm("Do you really want to delete user "+ user +"?");
@@ -328,7 +328,7 @@
 
 function deleteUserCallback() {
 
-    alertMessage("User was deleted successfully.");
+    wso2.wsf.Util.alertMessage("User was deleted successfully.");
     manageUser();
 }
 
@@ -338,7 +338,7 @@
     role = role.replace(/\xA7/g,"'");
 
     if (user == 'admin') {
-        alertWarning("You cannot modify the default admin account settings!");
+        wso2.wsf.Util.alertWarning("You cannot modify the default admin account settings!");
         return false;
     }
     var deleteIt= confirm("Do you really want to unassign role "+ role +" from user " + user + "?");
@@ -358,9 +358,9 @@
     var data = this.req.responseXML;
 
     if (data.getElementsByTagName("return")[0].firstChild.nodeValue == "true") {
-        alertMessage("Unassigned user from role successfully.");
+        wso2.wsf.Util.alertMessage("Unassigned user from role successfully.");
     } else {
-        alertWarning("Role Cannot be removed since a user should have at least one role.<br/>" +
+        wso2.wsf.Util.alertWarning("Role Cannot be removed since a user should have at least one role.<br/>" +
                     "Please assign another role to this user before trying removing this role.");
     }
     manageUser();
@@ -369,7 +369,7 @@
 function addUserWtihRole(role) {
 
     if (currentUserName == 'admin') {
-        alertWarning("You cannot modify the default admin account settings!");
+        wso2.wsf.Util.alertWarning("You cannot modify the default admin account settings!");
         return false;
     }
 
@@ -388,7 +388,7 @@
 
 function addUserWtihRoleCallback() {
 
-    alertMessage("Role successfully assigned to user");
+    wso2.wsf.Util.alertMessage("Role successfully assigned to user");
     manageUser();
 }
 
@@ -396,7 +396,7 @@
     role = role.replace(/\xA7/g,"'");
 
     if (role == 'admin') {
-        alertWarning("You cannot delete the default admin role!");
+        wso2.wsf.Util.alertWarning("You cannot delete the default admin role!");
         return false;
     }
     var deleteIt= confirm("Do you really want to delete role "+ role +"?");
@@ -415,7 +415,7 @@
     var data = this.req.responseXML;
 
     var deleteStatement = data.getElementsByTagName("return")[0].firstChild.nodeValue;
-    alertMessage(deleteStatement);
+    wso2.wsf.Util.alertMessage(deleteStatement);
 
     manageRole();
 

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  1 07:45:22 2007
@@ -35,7 +35,7 @@
                 httpsPort + "." +
                 "<br/> If the default settings have not been changed the management console can be accessed using the following URL.<br/>" +
                 "<a href='" + newURL + "'>" + newURL + "</a>";
-        alertInternal(httpsAlertText, WARNING_MESSAGE);
+        wso2.wsf.Util.alertInternal(httpsAlertText, WARNING_MESSAGE);
 
     }
 

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/list_services.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/list_services.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/list_services.xsl	Fri Jun  1 07:45:22 2007
@@ -1,45 +1,45 @@
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:template match="initializeService" >
-        <table>
-        	<tr>
-        		<td><h2>Service &amp; Service Group Management</h2></td>
-				<td valign="top">&#160;&#160;&#160;&#160;
-					<a id="rss_link">
-						<xsl:attribute name="href">#</xsl:attribute>
-						<xsl:attribute name="onClick">javascript:openWindowHTTP('rss');return false;</xsl:attribute>
-						<xsl:attribute name="target">_blank</xsl:attribute>
-						<xsl:attribute name="title">@server_name@ RSS 2.0</xsl:attribute>
-						<xsl:attribute name="alt">@server_name@ RSS 2.0</xsl:attribute>
-						<xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text>
-					</a>&#160;&#160;&#160;&#160;
-					<a id="atom_link">
-						<xsl:attribute name="href">#</xsl:attribute>
-                        <xsl:attribute name="onClick">javascript:openWindowHTTP('atom');return false;</xsl:attribute>
-                        <xsl:attribute name="target">_blank</xsl:attribute>
-						<xsl:attribute name="title">@server_name at n Atom 1.0</xsl:attribute>
-						<xsl:attribute name="alt">@server_name at n Atom 1.0</xsl:attribute>
-						<xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text>
-					</a>
-				</td>
-			</tr>
-        </table>
-        
-        <fieldset style="border:none;">
-        <div id="listServicesInformation">
-            <p>Refreshing service list...</p>
-        </div>
-
-        <div id="faultyServices" style="display:none;"></div>
-        <p>&#160;</p>
-            <div id="formsetWrapper">
-                <div id="formset">
-                    <xsl:call-template name="serviceUploadTemplate"/>
-                    <xsl:call-template name="springUploadTemplate"/>
-                </div>
-            </div>
-
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <xsl:template match="initializeService" >
+        <table>
+        	<tr>
+        		<td><h2>Service &amp; Service Group Management</h2></td>
+				<td valign="top">&#160;&#160;&#160;&#160;
+					<a id="rss_link">
+						<xsl:attribute name="href">#</xsl:attribute>
+						<xsl:attribute name="onClick">javascript:openWindowHTTP('rss');return false;</xsl:attribute>
+						<xsl:attribute name="target">_blank</xsl:attribute>
+						<xsl:attribute name="title">@server_name@ RSS 2.0</xsl:attribute>
+						<xsl:attribute name="alt">@server_name@ RSS 2.0</xsl:attribute>
+						<xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text>
+					</a>&#160;&#160;&#160;&#160;
+					<a id="atom_link">
+						<xsl:attribute name="href">#</xsl:attribute>
+                        <xsl:attribute name="onClick">javascript:openWindowHTTP('atom');return false;</xsl:attribute>
+                        <xsl:attribute name="target">_blank</xsl:attribute>
+						<xsl:attribute name="title">@server_name at n Atom 1.0</xsl:attribute>
+						<xsl:attribute name="alt">@server_name at n Atom 1.0</xsl:attribute>
+						<xsl:text>&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</xsl:text>
+					</a>
+				</td>
+			</tr>
+        </table>
+        
+        <fieldset style="border:none;">
+        <div id="listServicesInformation">
+            <p>Refreshing service list...</p>
+        </div>
+
+        <div id="faultyServices" style="display:none;"></div>
+        <p>&#160;</p>
+            <div id="formsetWrapper">
+                <div id="formset">
+                    <xsl:call-template name="serviceUploadTemplate"/>
+                    <xsl:call-template name="springUploadTemplate"/>
+                </div>
+            </div>
+
         </fieldset>
    	    <div>
    			<label><a alt="Add New">
@@ -58,42 +58,42 @@
    				<xsl:attribute name="onclick">javascript:ejbProviderConfig();return false;</xsl:attribute>
    				<xsl:text>&#160;&#160;&#160;&#160;New EJB Service</xsl:text>
    			</a></label>
-       	   </div>
-    </xsl:template>
-
-    <xsl:template name="serviceUploadTemplate">
-            <form method="post"  name="serviceUpload" action="fileupload/service" enctype="multipart/form-data" target="globalIFrame">
-                <fieldset>
-                    <legend>Upload a New Service (.aar, .jar or .zip)</legend>
-                    <div>
-                        <label for="module_a">Service archive (.aar,.jar,.zip) :</label><input type="file" id="filename" name="filename" size="50"/>
-                    </div>
-                    <div class="buttonrow">
-                        <input name="upload" type="submit" value=" Upload ">
-                            <xsl:attribute name="onclick">javascript: if (document.serviceUpload.filename.value == '') { alertWarning('Please select a file before clicking upload.'); return false;} else { stoppingRefreshingMethodsHook(); return true;}</xsl:attribute>
-                        </input>
-                    </div>
-                </fieldset>
-             </form>
-    </xsl:template>
-
-    <xsl:template name="springUploadTemplate">
-        <form method="post"  name="springUpload" action="fileupload/spring" enctype="multipart/form-data" target="globalIFrame">
-                <fieldset>
-                    <legend>Upload a New Spring Service (.xml and .jar)</legend>
-                    <div for="spring_a">
-                        <label>Spring Context (.xml) :</label><input type="file" id="springContext" name="springContext" size="50"/>
-                    </div>
-                    <div><br/></div>
-                    <div for="sprng_b">
-                        <label>Spring Beans (.jar) :</label><input type="file" id="springBeans" name="springBeans" size="50"/>
-                    </div>
-                    <div class="buttonrow">
-                        <input name="upload" type="submit" value=" Upload ">
-                            <xsl:attribute name="onclick">javascript: if (document.springUpload.springContext.value == '' || document.springUpload.springBeans.value == '') { alertWarning('Please select required fields to upload spring service'); return false;} else { stoppingRefreshingMethodsHook(); return true;}</xsl:attribute>
-                        </input>
-                    </div>
-                </fieldset>
-          </form>
-    </xsl:template>
+       	   </div>
+    </xsl:template>
+
+    <xsl:template name="serviceUploadTemplate">
+            <form method="post"  name="serviceUpload" action="fileupload/service" enctype="multipart/form-data" target="globalIFrame">
+                <fieldset>
+                    <legend>Upload a New Service (.aar, .jar or .zip)</legend>
+                    <div>
+                        <label for="module_a">Service archive (.aar,.jar,.zip) :</label><input type="file" id="filename" name="filename" size="50"/>
+                    </div>
+                    <div class="buttonrow">
+                        <input name="upload" type="submit" value=" Upload ">
+                            <xsl:attribute name="onclick">javascript: if (document.serviceUpload.filename.value == '') { wso2.wsf.Util.alertWarning('Please select a file before clicking upload.'); return false;} else { stoppingRefreshingMethodsHook(); return true;}</xsl:attribute>
+                        </input>
+                    </div>
+                </fieldset>
+             </form>
+    </xsl:template>
+
+    <xsl:template name="springUploadTemplate">
+        <form method="post"  name="springUpload" action="fileupload/spring" enctype="multipart/form-data" target="globalIFrame">
+                <fieldset>
+                    <legend>Upload a New Spring Service (.xml and .jar)</legend>
+                    <div for="spring_a">
+                        <label>Spring Context (.xml) :</label><input type="file" id="springContext" name="springContext" size="50"/>
+                    </div>
+                    <div><br/></div>
+                    <div for="sprng_b">
+                        <label>Spring Beans (.jar) :</label><input type="file" id="springBeans" name="springBeans" size="50"/>
+                    </div>
+                    <div class="buttonrow">
+                        <input name="upload" type="submit" value=" Upload ">
+                            <xsl:attribute name="onclick">javascript: if (document.springUpload.springContext.value == '' || document.springUpload.springBeans.value == '') { wso2.wsf.Util.alertWarning('Please select required fields to upload spring service'); return false;} else { stoppingRefreshingMethodsHook(); return true;}</xsl:attribute>
+                        </input>
+                    </div>
+                </fieldset>
+          </form>
+    </xsl:template>
 </xsl:stylesheet>

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/modules.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/modules.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/modules.xsl	Fri Jun  1 07:45:22 2007
@@ -75,7 +75,7 @@
 					</div>
 					<div class="buttonrow">
 						<input name="upload" type="submit" value=" Upload ">
-							<xsl:attribute name="onclick">javascript: if (document.Axis2upload.filename.value == '') { alertWarning('Please select a file before clicking upload.'); return false;}</xsl:attribute>
+							<xsl:attribute name="onclick">javascript: if (document.Axis2upload.filename.value == '') { wso2.wsf.Util.alertWarning('Please select a file before clicking upload.'); return false;}</xsl:attribute>
 						</input>
 					</div>
 				</fieldset>




More information about the Wsas-java-dev mailing list