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

[svn at wso2.org]

Author: saminda
Date: Mon Jun  4 05:19:51 2007
New Revision: 3492

Modified:
   trunk/wsas/java/modules/www/extensions/core/js/services.js
   trunk/wsas/java/modules/www/extensions/core/js/wso2wsas.js
   trunk/wsas/java/pom.xml
Log:
Updates to cope with main.js


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	Mon Jun  4 05:19:51 2007
@@ -1521,7 +1521,7 @@
 }
 
 function wsdlForDynamicClient() {
-    window.open(SERVICE_CONTEXT + '/' + getServiceSpecificName() + '?wsdl');
+    window.open("/" + SERVICE_PATH + '/' + getServiceSpecificName() + '?wsdl');
 }
 
 

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	Mon Jun  4 05:19:51 2007
@@ -18,15 +18,13 @@
 */
 var RAMPART_OUTFLOW_CONFIG_ADMIN_STRING = "RampartOutflowConfigAdmin";
 
-var SERVICE_CONTEXT = "/services";
-
-var COOKIE_SESSION_MANAGEMENT = true;
-var SESSION_COOKIE_NAME = "JSESSIONID";
-
 function init() {
-    URL = locationString.substring(0, locationString.lastIndexOf('/'));
 
-    if (URL.indexOf('https') == -1) {
+    wso2.wsf.Util.initURLs();
+
+    /*Only for protocol determination*/
+    var _tmpURL = locationString.substring(0, locationString.lastIndexOf('/'));
+    if (_tmpURL.indexOf('https') == -1) {
         //	alert("You can only access the management console through https. \n The default https port for @server_short_name@ is " + httpsPort + ".");
         var newURL = "https" + URL.substring(URL.indexOf('://'), URL.lastIndexOf(':') + 1) +
                      httpsPort;

Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml	(original)
+++ trunk/wsas/java/pom.xml	Mon Jun  4 05:19:51 2007
@@ -1275,6 +1275,8 @@
         <wso2tracer.version>SNAPSHOT</wso2tracer.version>
         <dynamiccodegen.version>SNAPSHOT</dynamiccodegen.version>
         <wsrequest.version>SNAPSHOT</wsrequest.version>
+        <wso2.adminui.version>SNAPSHOT</wso2.adminui.version>
+        <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs>
 
         <axiom.version>SNAPSHOT</axiom.version>
         <addressing.version>SNAPSHOT</addressing.version>
@@ -1333,9 +1335,6 @@
 
         <geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version>
 
-        <wso2.adminui.version>1.2-SNAPSHOT</wso2.adminui.version>
-        <wso2.adminui.version.graphs>1.1</wso2.adminui.version.graphs>
-
         <server.short.name>WSO2 WSAS</server.short.name>
         <server.name>WSO2 Web Services Application Server</server.name>