Author: ruwan
Date: Sun May 24 21:37:41 2009
New Revision: 36679
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=36679

Log:
sync up with synapse trunk (moving non axis2 specific resolver utils to another 
package)

Added:
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
      - copied, changed from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIResolver.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
      - copied, changed from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomWSDLLocator.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/ResourceMap.java
      - copied, changed from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ResourceMap.java
Removed:
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIResolver.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomWSDLLocator.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ResourceMap.java
Modified:
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapFactory.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapSerializer.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/WSDL11EndpointBuilder.java
   
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
   
branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/core/axis2/ProxyServiceTest.java

Modified: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapFactory.java
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapFactory.java?rev=36679&r1=36678&r2=36679&view=diff
==============================================================================
--- 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapFactory.java
        (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapFactory.java
        Sun May 24 21:37:41 2009
@@ -28,7 +28,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseException;
-import org.apache.synapse.core.axis2.ResourceMap;
+import org.apache.synapse.util.resolver.ResourceMap;
 
 /**
  * Creates a ResourceMap object based on a set of <tt>&lt;resource&gt;</tt> 
elements:

Modified: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapSerializer.java
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapSerializer.java?rev=36679&r1=36678&r2=36679&view=diff
==============================================================================
--- 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapSerializer.java
     (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/ResourceMapSerializer.java
     Sun May 24 21:37:41 2009
@@ -25,7 +25,7 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.core.axis2.ResourceMap;
+import org.apache.synapse.util.resolver.ResourceMap;
 
 /**
  * Creates a sequence of <tt>&lt;resource&gt;</tt> elements from a ResourceMap 
object:

Modified: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/WSDL11EndpointBuilder.java
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/WSDL11EndpointBuilder.java?rev=36679&r1=36678&r2=36679&view=diff
==============================================================================
--- 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/WSDL11EndpointBuilder.java
     (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/utils/WSDL11EndpointBuilder.java
     Sun May 24 21:37:41 2009
@@ -25,7 +25,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.SynapseException;
-import org.apache.synapse.core.axis2.CustomWSDLLocator;
+import org.apache.synapse.util.resolver.CustomWSDLLocator;
 import org.apache.synapse.endpoints.EndpointDefinition;
 import org.w3c.dom.Document;
 import org.xml.sax.InputSource;

Deleted: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIResolver.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=36678

Deleted: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomWSDLLocator.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=36678

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=36679&r1=36678&r2=36679&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
      Sun May 24 21:37:41 2009
@@ -41,6 +41,9 @@
 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.CustomWSDLLocator;
+import org.apache.synapse.util.resolver.ResourceMap;
 import org.xml.sax.InputSource;
 
 import javax.xml.namespace.QName;

Deleted: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ResourceMap.java
URL: http://wso2.org/svn/browse/wso2/None?pathrev=36678

Copied: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
 (from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIResolver.java)
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java?rev=36679&r1=36579&r2=36679&view=diff
==============================================================================
--- 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomURIResolver.java
        (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomURIResolver.java
      Sun May 24 21:37:41 2009
@@ -17,10 +17,11 @@
  *  under the License.
  */
 
-package org.apache.synapse.core.axis2;
+package org.apache.synapse.util.resolver;
 
 import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.util.resolver.ResourceMap;
 import org.apache.ws.commons.schema.resolver.URIResolver;
 import org.xml.sax.InputSource;
 

Copied: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
 (from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomWSDLLocator.java)
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java?rev=36679&r1=36579&r2=36679&view=diff
==============================================================================
--- 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/CustomWSDLLocator.java
        (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/CustomWSDLLocator.java
      Sun May 24 21:37:41 2009
@@ -17,10 +17,11 @@
  *  under the License.
  */
 
-package org.apache.synapse.core.axis2;
+package org.apache.synapse.util.resolver;
 
 import org.apache.synapse.config.SynapseConfigUtils;
 import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.util.resolver.ResourceMap;
 import org.xml.sax.InputSource;
 
 import javax.wsdl.xml.WSDLLocator;

Copied: 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/ResourceMap.java
 (from r36579, 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ResourceMap.java)
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/ResourceMap.java?rev=36679&r1=36579&r2=36679&view=diff
==============================================================================
--- 
/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/ResourceMap.java
      (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/resolver/ResourceMap.java
    Sun May 24 21:37:41 2009
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.synapse.core.axis2;
+package org.apache.synapse.util.resolver;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.commons.logging.Log;

Modified: 
branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/core/axis2/ProxyServiceTest.java
URL: 
http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/core/axis2/ProxyServiceTest.java?rev=36679&r1=36678&r2=36679&view=diff
==============================================================================
--- 
branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/core/axis2/ProxyServiceTest.java
  (original)
+++ 
branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/core/axis2/ProxyServiceTest.java
  Sun May 24 21:37:41 2009
@@ -31,6 +31,7 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.synapse.config.Entry;
 import org.apache.synapse.config.SynapseConfiguration;
+import org.apache.synapse.util.resolver.ResourceMap;
 import org.xml.sax.InputSource;
 
 public class ProxyServiceTest extends TestCase {

_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev

Reply via email to