svn commit: r929403 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: Axis2SynapseController.java core/axis2/ProxyService.java

[hiranya]

Author: hiranya
Date: Wed Mar 31 06:29:54 2010
New Revision: 929403

URL: http://svn.apache.org/viewvc?rev=929403&view=rev
Log:
Changing the behavior of the publish WSDL safe mode to not deploy the proxy 
service at all, if the WSDL cannot be loaded at startup


Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=929403&r1=929402&r2=929403&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
 Wed Mar 31 06:29:54 2010
@@ -600,11 +600,15 @@ public class Axis2SynapseController impl
                 }
             }
 
-            proxy.buildAxisService(synapseConfiguration,
+            AxisService proxyService = 
proxy.buildAxisService(synapseConfiguration,
                     configurationContext.getAxisConfiguration());
-            log.info("Deployed Proxy service : " + proxy.getName());
-            if (!proxy.isStartOnLoad()) {
-                proxy.stop(synapseConfiguration);
+            if (proxyService != null) {
+                log.info("Deployed Proxy service : " + proxy.getName());
+                if (!proxy.isStartOnLoad()) {
+                    proxy.stop(synapseConfiguration);
+                }
+            } else {
+                log.warn("The proxy service " + proxy.getName() + " will NOT 
be available");
             }
         }
     }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=929403&r1=929402&r2=929403&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 Wed Mar 31 06:29:54 2010
@@ -297,9 +297,8 @@ public class ProxyService implements Asp
                         trace.info("enableURISafeMode: true");
                     }
 
-                    proxyService = new AxisService();
-                    AxisOperation mediateOperation = new 
InOutAxisOperation(new QName("mediate"));
-                    proxyService.addOperation(mediateOperation);
+                    log.warn("Unable to load the WSDL for : " + name, e);
+                    return null;
                 } else {
                     if (trace()) {
                         trace.info("WSDL was unable to load for: " + 
publishWSDL);