[esb-java-dev] svn commit r765 - in trunk/esb/java/modules: core/src/main/java/org/wso2/esb/services distribution/src/main/www/extensions/core/js

[svn at wso2.org]

Author: ruwan
Date: Tue Feb  6 01:13:28 2007
New Revision: 765

Modified:
   trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
   trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/_proxyservices.js
Log:
fixing proxy edit bugs

Modified: trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java
==============================================================================
--- trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java	(original)
+++ trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ProxyServiceAdmin.java	Tue Feb  6 01:13:28 2007
@@ -114,6 +114,9 @@
                     ProxyService proxy = ProxyServiceFactory.createProxy(proxyServiceElement);
                     getSynapseConfiguration().addProxyService(proxy.getName(), proxy);
                     proxy.buildAxisService(getSynapseConfiguration(), getSynapseConfiguration().getAxisConfiguration());
+                    if(!proxy.isStartOnLoad()) {
+                        proxy.stop(getSynapseConfiguration());
+                    }
                 }
             } else {
                 throw new AxisFault("Invalid proxy service element");

Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/_proxyservices.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/_proxyservices.js	(original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/_proxyservices.js	Tue Feb  6 01:13:28 2007
@@ -161,19 +161,33 @@
 
 function setactionpanel(actionpanel, index) {
     
-    actionpanel.innerHTML = "<table><tr><td><input type='button' id='buttonpanel16' class='panelbutton' "
+    var panelhtml = "<table><tr><td><input type='button' id='buttonpanel16' class='panelbutton' "
             + "onmouseover='javascript: showbutton(16); return false;' onmouseout='javascript: normalbutton(16); "
-            + "return false;' value='Cancel' onclick='javascript:showProxyServices();return false;'/></td>"
-            + "<td></td><td><input type='button' id='buttonpanel17' class='panelbutton' "
+            + "return false;' value='Cancel' onclick='javascript:showProxyServices();return false;'/></td>";
+    
+    if(index != 1) {
+        panelhtml += "<td></td><td><input type='button' id='buttonpanel17' class='panelbutton' "
             + "onmouseover='javascript: showbutton(17); return false;' onmouseout='javascript: normalbutton(17); "
-            + "return false;' value='Finish' onclick='javascript:viewproxyinconsole();return false;'/></td>"
-            + "<td></td><td><input type='button' id='buttonpanel18' class='panelbutton' "
+            + "return false;' value='Back' onclick='javascript:addproxybackstep();return false;'/></td>";
+    }
+
+    if(index != 4) {
+        panelhtml += "<td></td><td><input type='button' id='buttonpanel18' class='panelbutton' "
             + "onmouseover='javascript: showbutton(18); return false;' onmouseout='javascript: normalbutton(18); "
-            + "return false;' value='Next' onclick='javascript:addproxynextstep();return false;'/></td></tr></table>"
+            + "return false;' value='Next' onclick='javascript:addproxynextstep();return false;'/></td>";
+    }
+
+    panelhtml += "<td></td><td><input type='button' id='buttonpanel19' class='panelbutton' "
+            + "onmouseover='javascript: showbutton(19); return false;' onmouseout='javascript: normalbutton(19); "
+            + "return false;' value='Finish' onclick='javascript:viewproxyinconsole();return false;'/></td>"
+            + "</tr></table>";
+
+    actionpanel.innerHTML = panelhtml;
 }
 
 function addproxynextstep() {
     var stepdiv = document.getElementById("addproxystep");
+    var actionpanel = document.getElementById("actionpanel");
     var index = stepdiv.getAttribute("name");
 
     proxydatacollect["step" + index](stepdiv);
@@ -181,6 +195,23 @@
     if(index != 4) {
         stepdiv.setAttribute("name", 1 + Number(index));
         editproxysteps(stepdiv, 1 + Number(index));
+        setactionpanel(actionpanel, 1 + Number(index));
+    } else {
+        viewproxyinconsole();
+    }
+}
+
+function addproxybackstep() {
+    var stepdiv = document.getElementById("addproxystep");
+    var actionpanel = document.getElementById("actionpanel");
+    var index = stepdiv.getAttribute("name");
+
+    proxydatacollect["step" + index](stepdiv);
+
+    if(index != 1) {
+        stepdiv.setAttribute("name", Number(index) - 1);
+        editproxysteps(stepdiv, Number(index) - 1);
+        setactionpanel(actionpanel, Number(index) - 1);
     } else {
         viewproxyinconsole();
     }
@@ -359,20 +390,26 @@
             + "the proxy service for them to be applied to the runtime service or else you can save the edited proxy service to "
             + "the registry for future uses in which case the service will not get deployed.</p><br/>";
 
-    savepanel.innerHTML += "<div id='proxysavediv'><table style='margin-left: 150px;'><tbody><tr>"
+    var panelhtml = "<div id='proxysavediv'><table style='margin-left: 150px;'><tbody><tr>"
             + "<td><input type='button' id='buttonpanel10' class='panelbutton' onmouseover='javascript: showbutton(10); "
             + "return false;' onmouseout='javascript: normalbutton(10); return false;' "
             + "onclick='javascript: proxysave(); return false;' value='Save'></td>"
-            + "<td></td>"
-            + "<td><input type='button' id='buttonpanel11' class='panelbutton' onmouseover='javascript: showbutton(11); "
+            + "<td></td>";
+    
+    if(!doingadd) {
+        panelhtml += "<td><input type='button' id='buttonpanel11' class='panelbutton' onmouseover='javascript: showbutton(11); "
             + "return false;' onmouseout='javascript: normalbutton(11); return false;' "
             + "onclick='javascript: proxysaveas(); return false;' value='Clone'/></td>"
-            + "<td></td>"
-            + "<td><input type='button' id='buttonpanel12' class='panelbutton' onmouseover='javascript: showbutton(12); "
+            + "<td></td>";
+    }
+
+    panelhtml += "<td><input type='button' id='buttonpanel12' class='panelbutton' onmouseover='javascript: showbutton(12); "
             + "return false;' onmouseout='javascript: normalbutton(12); return false;' "
             + "onclick='javascript: showProxyServices(); return false;' value='Discard'/></td>"
             + "</tr></tbody></table></div>";
 
+    savepanel.innerHTML += panelhtml;
+
     proxydiv.appendChild(savepanel);
 }