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

[svn at wso2.org]

Author: sumedha
Date: Sun Jul  1 18:06:06 2007
New Revision: 4589

Modified:
   trunk/wsas/java/modules/www/extensions/core/js/ejb_provider_service.js
   trunk/wsas/java/modules/www/extensions/core/xslt/ejb_provider_service.xsl
Log:
added validation for ejb provider screen 1

Modified: trunk/wsas/java/modules/www/extensions/core/js/ejb_provider_service.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/ejb_provider_service.js	(original)
+++ trunk/wsas/java/modules/www/extensions/core/js/ejb_provider_service.js	Sun Jul  1 18:06:06 2007
@@ -1,18 +1,50 @@
 var ejbProviderConfigObject = '';
 
 function addApplicationServer(){
+	var serverType = document.getElementById('serverType').value;
+	var providerURL = document.getElementById('providerUrl').value;
+	var jndiContextClass = document.getElementById('jndiContextClass').value;
+	var jndiUserName = document.getElementById('userName').value;
+	var password = document.getElementById('password').value;
+	var confirmPassword = document.getElementById('confirmPassword').value;
+	
+	
+	if(serverType == null || wso2.wsf.Util.trim(serverType) == ""){
+        wso2.wsf.Util.alertWarning("Please select an Application Server type.");
+        return false;
+    }
+	
+	if(providerURL == null || wso2.wsf.Util.trim(providerURL) == ""){
+        wso2.wsf.Util.alertWarning("Please enter a valid provider url.");
+        return false;
+    }
+	if(jndiContextClass == null || wso2.wsf.Util.trim(jndiContextClass) == ""){
+        wso2.wsf.Util.alertWarning("Please enter a valid JNDI Context class.");
+        return false;
+    }
+	if(password != null && wso2.wsf.Util.trim(password) != ""){
+		if(jndiUserName == null || wso2.wsf.Util.trim(jndiUserName) == ""){
+	        wso2.wsf.Util.alertWarning("Please enter username for the password provided.");
+    	    return false;			
+		}		
+		if(password != confirmPassword){
+	        wso2.wsf.Util.alertWarning("Password and re-entered password do not match.");
+    	    return false;
+		}
+    }	
+	
 	var ejbAppServer_xml = '';
     ejbAppServer_xml +=
-    ' <req:providerUrl>' + document.getElementById('providerUrl').value + '</req:providerUrl>\n';
+    ' <req:providerUrl>' + providerURL + '</req:providerUrl>\n';
     ejbAppServer_xml +=
-    ' <req:jndiContextClass>' + document.getElementById('jndiContextClass').value +
+    ' <req:jndiContextClass>' + jndiContextClass +
     '</req:jndiContextClass>\n';
     ejbAppServer_xml +=
-    ' <req:userName>' + document.getElementById('userName').value + '</req:userName>\n';
+    ' <req:userName>' + jndiUserName + '</req:userName>\n';
     ejbAppServer_xml +=
-    ' <req:password>' + document.getElementById('password').value + '</req:password>\n';
+    ' <req:password>' + password + '</req:password>\n';
     ejbAppServer_xml +=
-    ' <req:appServerType>' + document.getElementById('serverType').value + '</req:appServerType>\n';
+    ' <req:appServerType>' + serverType + '</req:appServerType>\n';
 	
    var body_xml = '<req:addApplicationServerRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
    				  ejbAppServer_xml +
@@ -298,6 +330,8 @@
 		document.getElementById('jndiContextClass').disabled = false;
 		document.getElementById('userName').disabled = false;
 		document.getElementById('password').disabled = false;
+		document.getElementById('confirmPassword').disabled = false;
+		document.getElementById('addApplicationServerButton').disabled = false;
 	}else if (value == 'existingEJBServer'){
 		//enable existing
 		document.getElementById('existingAppServerConfigurations').disabled = false;
@@ -307,6 +341,8 @@
 		document.getElementById('jndiContextClass').disabled = true;
 		document.getElementById('userName').disabled = true;
 		document.getElementById('password').disabled = true;
+		document.getElementById('confirmPassword').disabled = true;
+		document.getElementById('addApplicationServerButton').disabled = true;
 	}
 }
 
@@ -318,4 +354,6 @@
 	document.getElementById('jndiContextClass').disabled = true;
 	document.getElementById('userName').disabled = true;
 	document.getElementById('password').disabled = true;
+	document.getElementById('confirmPassword').disabled = true;
+	document.getElementById('addApplicationServerButton').disabled = true;
 }

Modified: trunk/wsas/java/modules/www/extensions/core/xslt/ejb_provider_service.xsl
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/xslt/ejb_provider_service.xsl	(original)
+++ trunk/wsas/java/modules/www/extensions/core/xslt/ejb_provider_service.xsl	Sun Jul  1 18:06:06 2007
@@ -99,10 +99,13 @@
 							                        <label for="userName">User Name</label><input type="text" id="userName" tabindex="4" size="15" maxlength="20"/>
 							                    </div>
                     							<div>
-							                        <label for="password">Password</label><input type="text" id="password" tabindex="5" size="15" maxlength="20"/>
+							                        <label for="password">Password</label><input type="password" id="password" tabindex="5" size="15" maxlength="20"/>
 							                    </div>
+                    							<div>
+							                        <label for="password">Confirm Password</label><input type="password" id="confirmPassword" tabindex="5" size="15" maxlength="20"/>
+							                    </div>												
 												<div>
-													<input type="button" name="addApplicationServerButton" onclick="javascript:addApplicationServer();" value=" Add Application Server "></input>
+													<label></label><input type="button" id="addApplicationServerButton" name="addApplicationServerButton" onclick="javascript:addApplicationServer();" value=" Add Application Server "></input>
 												</div>
 									    </td>
 					 			   </tr>