svn commit: r778238 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: core/axis2/ProxyService.java util/resolver/CustomURIResolver.java util/resolver/CustomXmlSchemaURIResolver.java

[veithen]

Author: veithen
Date: Sun May 24 21:17:48 2009
New Revision: 778238

URL: http://svn.apache.org/viewvc?rev=778238&view=rev
Log:
Cleanup after SYNAPSE-489: Renamed CustomURIResolver to 
CustomXmlSchemaURIResolver to avoid confusion (there are lot's of different 
URIResolver classes in different APIs).

Added:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
   (contents, props changed)
      - copied, changed from r778219, 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
Removed:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
Modified:
    
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/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=778238&r1=778237&r2=778238&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
 Sun May 24 21:17:48 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)

Copied: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
 (from r778219, 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java)
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java?p2=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java&p1=synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java&r1=778219&r2=778238&rev=778238&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
 Sun May 24 21:17:48 2009
@@ -25,13 +25,13 @@
 import org.xml.sax.InputSource;
 
 /**
- * Class that adapts a {...@link ResourceMap} to {...@link URIResolver}.
+ * Class that adapts a {...@link ResourceMap} to XmlSchemas's {...@link 
URIResolver}.
  */
-public class CustomURIResolver implements URIResolver {
+public class CustomXmlSchemaURIResolver implements URIResolver {
     private ResourceMap resourceMap;
     private SynapseConfiguration synCfg;
 
-    public CustomURIResolver() {
+    public CustomXmlSchemaURIResolver() {
     }
     
     /**
@@ -40,7 +40,7 @@
      * @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;

Propchange: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomXmlSchemaURIResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo =