You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/10/26 10:17:47 UTC

svn commit: r588555 - in /webservices/synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/core/axis2/ modules/transports/src/main/java/org/apache/synapse/transport/vfs/ repository/conf/sample/ src/main/assembly/

Author: asankha
Date: Fri Oct 26 01:17:42 2007
New Revision: 588555

URL: http://svn.apache.org/viewvc?rev=588555&view=rev
Log:
make VFS initialize using our own providers.xml file instead of the default shipped with VFS - since we override the Zip provider with TrueZip

Added:
    webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_120.xml
Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
    webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
    webservices/synapse/trunk/java/src/main/assembly/bin.xml

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?rev=588555&r1=588554&r2=588555&view=diff
==============================================================================
--- 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 Fri Oct 26 01:17:42 2007
@@ -266,6 +266,14 @@
                             }
                         }
                         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) {

Modified: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=588555&r1=588554&r2=588555&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java Fri Oct 26 01:17:42 2007
@@ -28,6 +28,7 @@
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.commons.vfs.*;
+import org.apache.commons.vfs.impl.StandardFileSystemManager;
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
@@ -112,7 +113,10 @@
         setTransportName(TRANSPORT_NAME);
         super.init(cfgCtx, trpInDesc);
         try {
-            fsManager = VFS.getManager();
+            StandardFileSystemManager fsm = new StandardFileSystemManager();
+            fsm.setConfiguration(getClass().getClassLoader().getResource("providers.xml"));
+            fsm.init();
+            fsManager = fsm;
         } catch (FileSystemException e) {
             handleException("Error initializing the file transport : " + e.getMessage(), e);
         }

Modified: webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java?rev=588555&r1=588554&r2=588555&view=diff
==============================================================================
--- webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java (original)
+++ webservices/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java Fri Oct 26 01:17:42 2007
@@ -30,6 +30,7 @@
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.commons.vfs.*;
+import org.apache.commons.vfs.impl.StandardFileSystemManager;
 import org.apache.commons.logging.LogFactory;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMElement;
@@ -69,7 +70,10 @@
         setTransportName(TRANSPORT_NAME);
         super.init(cfgCtx, transportOut);
         try {
-            fsManager = VFS.getManager();
+            StandardFileSystemManager fsm = new StandardFileSystemManager();
+            fsm.setConfiguration(getClass().getClassLoader().getResource("providers.xml"));
+            fsm.init();
+            fsManager = fsm;
         } catch (FileSystemException e) {
             handleException("Error initializing the file transport : " + e.getMessage(), e);
         }

Added: webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_120.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_120.xml?rev=588555&view=auto
==============================================================================
--- webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_120.xml (added)
+++ webservices/synapse/trunk/java/repository/conf/sample/synapse_sample_120.xml Fri Oct 26 01:17:42 2007
@@ -0,0 +1,36 @@
+<!--
+  ~  Licensed to the Apache Software Foundation (ASF) under one
+  ~  or more contributor license agreements.  See the NOTICE file
+  ~  distributed with this work for additional information
+  ~  regarding copyright ownership.  The ASF licenses this file
+  ~  to you under the Apache License, Version 2.0 (the
+  ~  "License"); you may not use this file except in compliance
+  ~  with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~  Unless required by applicable law or agreed to in writing,
+  ~  software distributed under the License is distributed on an
+  ~   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~  KIND, either express or implied.  See the License for the
+  ~  specific language governing permissions and limitations
+  ~  under the License.
+  -->
+
+<!-- introduction to Synapse proxy services -->
+<definitions xmlns="http://ws.apache.org/ns/synapse">
+    <proxy name="StockQuoteProxy">
+        <target>
+            <endpoint>
+                <address uri="vfs:zip:file:///tmp/out/something.zip!out.xml"/>
+            </endpoint>
+                <outSequence>
+                <send/>
+                </outSequence>
+        </target>
+        <parameter name="transport.vfs.FileURI">file:///tmp/in</parameter>
+        <parameter name="transport.vfs.ContentType">text/xml</parameter>
+        <parameter name="transport.vfs.FileNamePattern">in.xml</parameter>
+        <parameter name="transport.PollInterval">60</parameter>
+    </proxy>
+</definitions>
\ No newline at end of file

Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?rev=588555&r1=588554&r2=588555&view=diff
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Fri Oct 26 01:17:42 2007
@@ -84,6 +84,7 @@
             <outputDirectory>synapse-${synapse.version}/lib</outputDirectory>
             <includes>
                 <include>log4j.properties</include>
+                <include>providers.xml</include>
                 <include>identity.jks</include>
                 <include>trust.jks</include>
             </includes>



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