Author: asankha
Date: Tue May 22 02:08:23 2007
New Revision: 540500
URL: http://svn.apache.org/viewvc?view=rev&rev=540500
Log:
more robust proxy services addition and support for WSDL 2 based proxy services
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?view=diff&rev=540500&r1=540499&r2=540500
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
Tue May 22 02:08:23 2007
@@ -348,10 +348,13 @@
handleException("Unknown proxy service for name : " + name);
} else {
try {
-
if(getAxisConfiguration().getServiceForActivation(name).isActive()) {
- getAxisConfiguration().getService(name).setActive(false);
+ if(getAxisConfiguration().getServiceForActivation(name) !=
null) {
+ if
(getAxisConfiguration().getServiceForActivation(name).isActive()) {
+
getAxisConfiguration().getService(name).setActive(false);
+ } else {
+ getAxisConfiguration().removeService(name);
+ }
}
- getAxisConfiguration().removeService(name);
proxyServices.remove(name);
} catch (AxisFault axisFault) {
handleException(axisFault.getMessage());
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=540500&r1=540499&r2=540500
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Tue May 22 02:08:23 2007
@@ -221,6 +221,7 @@
equals(wsdlNamespace.getNamespaceURI())) {
wsdlToAxisServiceBuilder =
new
WSDL20ToAxisServiceBuilder(wsdlInputStream, null, null);
+ wsdlToAxisServiceBuilder.setBaseUri(wsdlURI !=
null ? wsdlURI.toString() : "");
} else if
(org.apache.axis2.namespace.Constants.NS_URI_WSDL11.
equals(wsdlNamespace.getNamespaceURI())) {
Modified:
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html?view=diff&rev=540500&r1=540499&r2=540500
==============================================================================
---
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
(original)
+++
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
Tue May 22 02:08:23 2007
@@ -340,7 +340,7 @@
<endpoint>...</endpoint>?
</target>?
<publishWSDL key="string" uri="string">
- <endpoint>...</endpoint>?
+ <description>...</description> |
<definitions>...</definitions>
<publishWSDL>?
<enableSec/>? // These two tags
will removed after the recognition of the Security and RM can be done by
looking at policy
<enableRM/>?
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
