synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject svn commit: r612768 - in /webservices/synapse/branches/1.1.1: modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java patches/ patches/AxisService-patch.jar pom.xml src/main/assembly/bin.xml
Date Thu, 17 Jan 2008 09:09:22 GMT
Author: ruwan
Date: Thu Jan 17 01:09:18 2008
New Revision: 612768

URL: http://svn.apache.org/viewvc?rev=612768&view=rev
Log:
Fixing the patches model to work automated with the build and adding a patch to the AxisService
class in axis2-1.3 to solve a scema adding issue when building the service from the wsdl (WSDL11ToAxisServiceBuilder.populateService)

Added:
    webservices/synapse/branches/1.1.1/patches/
    webservices/synapse/branches/1.1.1/patches/AxisService-patch.jar   (with props)
Modified:
    webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/branches/1.1.1/pom.xml
    webservices/synapse/branches/1.1.1/src/main/assembly/bin.xml

Modified: webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=612768&r1=612767&r2=612768&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
(original)
+++ webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
Thu Jan 17 01:09:18 2008
@@ -259,7 +259,7 @@
                         } else if (org.apache.axis2.namespace.Constants.NS_URI_WSDL11.
                                 equals(wsdlNamespace.getNamespaceURI())) {
                             wsdlToAxisServiceBuilder =
-                                    new WSDL11ToAxisServiceBuilder(wsdlInputStream, null,
null);
+                                    new WSDL11ToAxisServiceBuilder(wsdlInputStream);
                             isWSDL11 = true;
                         } else {
                             handleException("Unknown WSDL format.. not WSDL 1.1 or WSDL 2.0");
@@ -298,14 +298,6 @@
                             }
                         }
                         proxyService = wsdlToAxisServiceBuilder.populateService();
-                        List schemaList = proxyService.getSchema();
-                        if (schemaList != null && schemaList.size() > 0) {
-                            // just pick the first schema's target namespace as Axis2's
-                            // HTTPTransportUtils code already contains a bug where it uses
the
-                            // services' schema target NS for each operation
-                            proxyService.setSchemaTargetNamespace(
-                                proxyService.getSchema(0).getTargetNamespace());
-                        }
                         proxyService.setWsdlFound(true);
 
                         if (isWSDL11) {

Added: webservices/synapse/branches/1.1.1/patches/AxisService-patch.jar
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/patches/AxisService-patch.jar?rev=612768&view=auto
==============================================================================
Binary file - no diff available.

Propchange: webservices/synapse/branches/1.1.1/patches/AxisService-patch.jar
------------------------------------------------------------------------------
    svn:executable = *

Propchange: webservices/synapse/branches/1.1.1/patches/AxisService-patch.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: webservices/synapse/branches/1.1.1/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/pom.xml?rev=612768&r1=612767&r2=612768&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/pom.xml (original)
+++ webservices/synapse/branches/1.1.1/pom.xml Thu Jan 17 01:09:18 2008
@@ -1050,7 +1050,7 @@
     <properties>
         <!-- Synapse and related components -->
         <synapse.version>1.1.1</synapse.version>
-        <httpcore.nio.version>4.0-alpha7</httpcore.nio.version>
+        <httpcore.nio.version>4.0-beta1</httpcore.nio.version>
         <commons.dbcp.version>1.2.2</commons.dbcp.version>
         <commons.pool.version>1.3</commons.pool.version>
         <commons.vfs.version>1.1-587797</commons.vfs.version>

Modified: webservices/synapse/branches/1.1.1/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/src/main/assembly/bin.xml?rev=612768&r1=612767&r2=612768&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/src/main/assembly/bin.xml (original)
+++ webservices/synapse/branches/1.1.1/src/main/assembly/bin.xml Thu Jan 17 01:09:18 2008
@@ -239,6 +239,13 @@
                 <include>patches.txt</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>patches</directory>
+            <outputDirectory>synapse-${synapse.version}/lib/patches</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>



---------------------------------------------------------------------
To unsubscribe, e-mail: synapse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: synapse-dev-help@ws.apache.org


Mime
View raw message