Author: ruwan
Date: Mon May 25 00:41:03 2009
New Revision: 36700
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=36700
Log:
sync up with the synapse trunk
Added:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
- copied, changed from r36679,
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
Removed:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
Modified:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Modified:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=36700&r1=36699&r2=36700&view=diff
==============================================================================
---
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Mon May 25 00:41:03 2009
@@ -41,7 +41,7 @@
import org.apache.synapse.endpoints.Endpoint;
import org.apache.synapse.mediators.base.SequenceMediator;
import org.apache.synapse.util.PolicyInfo;
-import org.apache.synapse.util.resolver.CustomURIResolver;
+import org.apache.synapse.util.resolver.CustomXmlSchemaURIResolver;
import org.apache.synapse.util.resolver.CustomWSDLLocator;
import org.apache.synapse.util.resolver.ResourceMap;
import org.xml.sax.InputSource;
@@ -367,7 +367,7 @@
if (resourceMap != null) {
// if the resource map is available use it
wsdlToAxisServiceBuilder.setCustomResolver(
- new CustomURIResolver(resourceMap, synCfg));
+ new CustomXmlSchemaURIResolver(resourceMap,
synCfg));
// Axis 2 also needs a WSDLLocator for WSDL 1.1
documents
if (wsdlToAxisServiceBuilder instanceof
WSDL11ToAxisServiceBuilder) {
((WSDL11ToAxisServiceBuilder)
@@ -380,7 +380,7 @@
//if the resource map isn't available ,
//then each import URIs will be resolved using
base URI
wsdlToAxisServiceBuilder.setCustomResolver(
- new CustomURIResolver());
+ new CustomXmlSchemaURIResolver());
// Axis 2 also needs a WSDLLocator for WSDL 1.1
documents
if (wsdlToAxisServiceBuilder instanceof
WSDL11ToAxisServiceBuilder) {
((WSDL11ToAxisServiceBuilder)
Deleted:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=36699
Copied:
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
(from r36679,
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java)
URL:
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java?rev=36700&r1=36679&r2=36700&view=diff
==============================================================================
---
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
(original)
+++
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
Mon May 25 00:41:03 2009
@@ -28,11 +28,11 @@
/**
* Class that adapts a {...@link ResourceMap} to {...@link URIResolver}.
*/
-public class CustomURIResolver implements URIResolver {
+public class CustomXmlSchemaURIResolver implements URIResolver {
private ResourceMap resourceMap;
private SynapseConfiguration synCfg;
- public CustomURIResolver() {
+ public CustomXmlSchemaURIResolver() {
}
/**
@@ -41,13 +41,13 @@
* @param resourceMap the resource map; may be null if no resource map is
configured
* @param synCfg the Synapse configuration
*/
- public CustomURIResolver(ResourceMap resourceMap,
+ public CustomXmlSchemaURIResolver(ResourceMap resourceMap,
SynapseConfiguration synCfg) {
this();
this.resourceMap = resourceMap;
this.synCfg = synCfg;
}
-
+
/**
* Resolve a schema import.
* This method will first attempt to resolve the location using the
configured
_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
