You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/06/11 08:59:09 UTC
svn commit: r666542 - in /incubator/tuscany/sandbox/axis2-1.4: ./
demos/bigbank-account/ demos/bigbank-stockquote/ demos/bigbank/
distribution/webapp/
itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/
itest/validation/src/main/res...
Author: antelder
Date: Tue Jun 10 23:59:07 2008
New Revision: 666542
URL: http://svn.apache.org/viewvc?rev=666542&view=rev
Log:
This is the latest trunk code upgraded to Axis2 1.4 and all its associated dependencies. Not all tests run yet
Added:
incubator/tuscany/sandbox/axis2-1.4/
- copied from r666541, incubator/tuscany/java/sca/
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/TestJavaInterface.java
- copied, changed from r666007, incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/TestJavaInterface.java
Removed:
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-import.wsdl
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/test/resources/org/apache/tuscany/sca/binding/ws/axis2/itests/questionmark-include.wsdl
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/TestJavaInterface.java
Modified:
incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-account/pom.xml
incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-stockquote/pom.xml
incubator/tuscany/sandbox/axis2-1.4/demos/bigbank/pom.xml
incubator/tuscany/sandbox/axis2-1.4/distribution/webapp/pom.xml
incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
incubator/tuscany/sandbox/axis2-1.4/modules/binding-notification/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
incubator/tuscany/sandbox/axis2-1.4/modules/contribution/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/databinding-axiom/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/databinding-jaxb-axiom/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/databinding-json/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/databinding-sdo-axiom/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/databinding-xstream/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/domain-impl/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/implementation-script/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/interface2wsdl/Java2WSDLGeneratorTestCase.java
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/node-impl/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/policy-security-ws/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml-ws/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/runtime/pom.xml
incubator/tuscany/sandbox/axis2-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
incubator/tuscany/sandbox/axis2-1.4/modules/xsd/pom.xml
incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-reference-secure/pom.xml
incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-service-secure/pom.xml
incubator/tuscany/sandbox/axis2-1.4/tools/eclipse/plugins/core/.classpath
incubator/tuscany/sandbox/axis2-1.4/tools/java2wsdl/pom.xml
incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/pom.xml
incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
Modified: incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-account/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-account/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-account/pom.xml Tue Jun 10 23:59:07 2008
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-stockquote/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-stockquote/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-stockquote/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/demos/bigbank-stockquote/pom.xml Tue Jun 10 23:59:07 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/demos/bigbank/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/demos/bigbank/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/demos/bigbank/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/demos/bigbank/pom.xml Tue Jun 10 23:59:07 2008
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/distribution/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/distribution/webapp/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/distribution/webapp/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/distribution/webapp/pom.xml Tue Jun 10 23:59:07 2008
@@ -340,12 +340,12 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.1</version>
+ <version>1.4</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/binding-notification/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/binding-notification/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/binding-notification/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/binding-notification/pom.xml Tue Jun 10 23:59:07 2008
@@ -87,7 +87,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/pom.xml Tue Jun 10 23:59:07 2008
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -146,14 +146,14 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<scope>runtime</scope>
</dependency>
@@ -166,7 +166,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -179,13 +179,19 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
- <artifactId>woden</artifactId>
- <version>1.0-incubating-M7b</version>
+ <artifactId>woden-api</artifactId>
+ <version>1.0M8</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.woden</groupId>
+ <artifactId>woden-impl-dom</artifactId>
+ <version>1.0M8</version>
<scope>runtime</scope>
</dependency>
@@ -217,7 +223,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -233,7 +239,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -251,7 +257,7 @@
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
- <version>2.2</version>
+ <version>3.1</version>
<scope>runtime</scope>
</dependency>
@@ -285,7 +291,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
@@ -303,19 +309,19 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.03</version>
+ <version>1.3.04</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -339,7 +345,7 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -363,7 +369,7 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/TuscanyAxisConfigurator.java Tue Jun 10 23:59:07 2008
@@ -61,7 +61,7 @@
getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml");
private URL axis2_repository = null;
private URL rampart_mar_url =
- getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.3.mar");
+ getResource("/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/rampart-1.4.mar");
/************** end of fix *************************************************************/
private boolean isRampartRequired;
@@ -156,8 +156,8 @@
module.setParent(axisConfig);
//String moduleFile = fileUrl.substring(0, fileUrl.indexOf(".mar"));
if (module.getName() == null) {
- module.setName(org.apache.axis2.util.Utils.getModuleName("rampart-1.3"));
- module.setVersion(org.apache.axis2.util.Utils.getModuleVersion("rampart-1.3"));
+ module.setName(org.apache.axis2.util.Utils.getModuleName("rampart-1.4"));
+ module.setVersion(org.apache.axis2.util.Utils.getModuleVersion("rampart-1.4"));
}
populateModule(module, rampart_mar_url);
module.setFileName(rampart_mar_url);
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/axis2.xml Tue Jun 10 23:59:07 2008
@@ -38,14 +38,22 @@
<!--parameter name="cacheAttachments">true</parameter>
<parameter name="attachmentDIR"></parameter>
<parameter name="sizeThreshold">4000</parameter-->
+
+ <!--Uncomment if you want to plugin your own attachments lifecycle implementation -->
+ <!--<attachmentsLifecycleManager class="org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl"/>-->
+
+ <!--Uncomment if you want to enable the reduction of the in-memory cache of WSDL definitions -->
+ <!--In some server environments, the available memory heap is limited and can fill up under load -->
+ <!--Since in-memory copies of WSDL definitions can be large, some steps can be taken-->
+ <!--to reduce the memory needed for the cached WSDL definitions. -->
+ <!--parameter name="reduceWSDLMemoryCache">true</parameter-->
+
<!--This will give out the timout of the configuration contexts, in milliseconds-->
<parameter name="ConfigContextTimeoutInterval">30000</parameter>
- <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+ <!--During a fault, stack trace can be sent with the fault message. The following flag will control -->
<!--that behavior.-->
-
- <!-- Customized by Tuscany -->
<parameter name="sendStacktraceDetailsWithFaults">true</parameter>
<!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
@@ -60,7 +68,7 @@
<!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
<!--ServicesDirectory only works on the following cases-->
<!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
- <!---When creating URL Based configurator with URL ââ¬Åfile://ââ¬Â -->
+ <!---When creating URL Based configurator with URL file:// -->
<!--- War based configurator with expanded case , -->
<!--All the other scenarios it will be ignored.-->
@@ -77,23 +85,26 @@
<!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguiush those endpoints-->
<!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this -->
<!--context path to proper Axis2 servlets-->
-
- <!-- Customized by Tuscany -->
<parameter name="servicePath">/</parameter>
-
<!--<parameter name="restPath">rest</parameter>-->
<!-- Following parameter will completely disable REST handling in Axis2-->
-
<parameter name="disableREST" locked="true">false</parameter>
+
+ <!-- Following parameter will suppress generation of SOAP 1.2 bindings in auto-generated WSDL files -->
+ <parameter name="disableSOAP12" locked="true">false</parameter>
<!--POJO deployer , this will alow users to drop .class file and make that into a service-->
<deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
+ <deployer extension=".jar" directory="servicejars" class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/>
+
+ <!--<deployer extension=".jsa" directory="rmiservices" class="org.apache.axis2.rmi.deploy.RMIServiceDeployer"/>-->
+
<!-- Following parameter will set the host name for the epr-->
<!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
- <!-- If you have a frontend host which exposes this webservice using a different public URL -->
+ <!-- If you have a front end host which exposes this webservice using a different public URL -->
<!-- use this parameter to override autodetected url -->
<!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
@@ -102,6 +113,10 @@
<!-- <listener class="org.apache.axis2.ObserverIMPL">-->
<!-- <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
<!-- </listener>-->
+
+ <threadContextMigrators>
+ <threadContextMigrator listId="JAXWS-ThreadContextMigrator-List" class="org.apache.axis2.jaxws.addressing.migrator.EndpointContextMapMigrator"/>
+ </threadContextMigrators>
<!-- ================================================= -->
<!-- Message Receivers -->
@@ -110,35 +125,17 @@
<!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
<!--any operation -->
<!--Note : You can ovrride this for a particular service by adding the same element with your requirement-->
- <messageReceivers>
-
- <!-- Added by Tuscany -->
+ <messageReceivers>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
-
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
- class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
- class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
- <!-- Added by Tuscany -->
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
-
- <!-- Added by Tuscany -->
<messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInMessageReceiver"/>
-
- <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
- class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
- <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
- class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-
- <!-- Added by Tuscany -->
<messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
class="org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceInOutSyncMessageReceiver"/>
-
</messageReceivers>
+
<!-- ================================================= -->
<!-- Message Formatter -->
<!-- ================================================= -->
@@ -151,6 +148,10 @@
class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
<messageFormatter contentType="application/xml"
class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+ <messageFormatter contentType="text/xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+ <messageFormatter contentType="application/soap+xml"
+ class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
</messageFormatters>
<!-- ================================================= -->
@@ -161,6 +162,8 @@
<messageBuilders>
<messageBuilder contentType="application/xml"
class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+ <messageBuilder contentType="application/xml"
+ class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
<messageBuilder contentType="application/x-www-form-urlencoded"
class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
<messageBuilder contentType="multipart/form-data"
@@ -172,10 +175,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
-
- <!-- Customized by Tuscany -->
- <parameter name="port" locked="false">6060</parameter>
-
+ <parameter name="port">6060</parameter>
<!-- Here is the complete list of supported parameters (see example settings further below):
port: the port to listen on (default 6060)
hostname: if non-null, url prefix used in reply-to endpoint references (default null)
@@ -195,34 +195,30 @@
<!-- <parameter name="requestTimeout">10000</parameter> -->
<!-- <parameter name="requestTcpNoDelay">false</parameter> -->
<!-- <parameter name="requestCoreThreadPoolSize">50</parameter> -->
- <!-- <parameter name="RequestMaxThreadPoolSize">100</parameter> -->
+ <!-- <parameter name="requestMaxThreadPoolSize">100</parameter> -->
<!-- <parameter name="threadKeepAliveTime">240000</parameter> -->
<!-- <parameter name="threadKeepAliveTimeUnit">MILLISECONDS</parameter> -->
</transportReceiver>
-
- <!-- Added by Tuscany -->
- <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
- <!-- These configuation parameters now come from the binding.ws uri
- or from a policy set
+
+ <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
<parameter name="myTopicConnectionFactory">
- <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</parameter>
</parameter>
<parameter name="myQueueConnectionFactory">
- <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
<parameter name="default">
- <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
- <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
- <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
+ <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+ <parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+ <parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
</parameter>
- -->
- </transportReceiver>
+ </transportReceiver>
<!-- ================================================= -->
<!-- Non-blocking http/s Transport Listener -->
@@ -299,15 +295,20 @@
<!-- If following is set to 'true', optional action part of the Content-Type will not be added to the SOAP 1.2 messages -->
<!-- <parameter name="OmitSOAP12Action">true</parameter> -->
</transportSender>
-
+
<transportSender name="https"
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
<parameter name="PROTOCOL">HTTP/1.1</parameter>
<parameter name="Transfer-Encoding">chunked</parameter>
</transportSender>
+
+ <!-- Please enable this if you need the java transport -->
+ <!-- <transportSender name="java"
+ class="org.apache.axis2.transport.java.JavaTransportSender"/> -->
+
<transportSender name="jms"
class="org.apache.axis2.transport.jms.JMSSender"/>
-
+
<!-- ================================================= -->
<!-- Non-blocking http/s Transport Sender -->
@@ -343,7 +344,7 @@
<!--Only need to uncomment the sender. Configuration is achieved with every client.
At any instant mail host should be given. Sample configuration has been given.
http://people.apache.org/~pzf/SMTPBase64Binding-0.2.html
- -->
+ -->
<!-- ================================================= -->
<!--<transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
<parameter name="mail.smtp.host">localhost</parameter>
@@ -353,10 +354,7 @@
<!-- Global Modules -->
<!-- ================================================= -->
<!-- Comment this to disable Addressing -->
-
- <!-- Commented out by Tuscany
- <module ref="addressing"/>
- -->
+ <!-- module ref="addressing"/ -->
<!-- Added by Tuscany -->
<!--
@@ -394,6 +392,8 @@
<cluster class="org.apache.axis2.cluster.tribes.TribesClusterManager">
<parameter name="param1">value1</parameter>
<parameter name="domain">apache.axis2.domain</parameter>
+ <parameter name="synchronizeAll">true</parameter>
+ <parameter name="maxRetries">10</parameter>
<configurationManager class="org.apache.axis2.cluster.configuration.TribesConfigurationManager">
<listener class="org.apache.axis2.cluster.configuration.DefaultConfigurationManagerListener"/>
</configurationManager>
@@ -407,7 +407,7 @@
<!-- Phases -->
<!-- ================================================= -->
<phaseOrder type="InFlow">
- <!-- System pre defined phases -->
+ <!-- System predefined phases -->
<phase name="Transport">
<!-- Added by Tuscany -->
@@ -442,20 +442,27 @@
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-<!--
- <handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
--->
+ <!-- handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/ -->
+ <handler name="GenericProviderDispatcher"
+ class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
+ <handler name="MustUnderstandValidationDispatcher"
+ class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
</phase>
<phase name="RMPhase"/>
- <!-- System pre defined phases -->
+ <!-- System predefined phases -->
<!-- After Postdispatch phase module author or service author can add any phase he want -->
- <phase name="OperationInPhase"/>
- <phase name="soapmonitorPhase"/>
+ <phase name="OperationInPhase">
+ <handler name="MustUnderstandChecker"
+ class="org.apache.axis2.jaxws.dispatchers.MustUnderstandChecker">
+ <order phase="OperationInPhase"/>
+ </handler>
+ </phase>
+ <phase name="soapmonitorPhase"/>
</phaseOrder>
<phaseOrder type="OutFlow">
<!-- user can add his own phases to this area -->
- <phase name="soapmonitorPhase"/>
+ <phase name="soapmonitorPhase"/>
<phase name="OperationOutPhase"/>
<!--system predefined phase-->
<!--these phase will run irrespective of the service-->
@@ -482,10 +489,12 @@
class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
<handler name="SOAPMessageBodyBasedDispatcher"
class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
-<!--
- <handler name="HTTPLocationBasedDispatcher"
- class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
--->
+ <!-- handler name="HTTPLocationBasedDispatcher"
+ class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/ -->
+ <handler name="GenericProviderDispatcher"
+ class="org.apache.axis2.jaxws.dispatchers.GenericProviderDispatcher"/>
+ <handler name="MustUnderstandValidationDispatcher"
+ class="org.apache.axis2.jaxws.dispatchers.MustUnderstandValidationDispatcher"/>
</phase>
<phase name="RMPhase"/>
<!-- user can add his own phases to this area -->
@@ -499,5 +508,7 @@
<phase name="RMPhase"/>
<phase name="PolicyDetermination"/>
<phase name="MessageOut"/>
+ <phase name="Security"/>
</phaseOrder>
</axisconfig>
+
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/binding-ws-axis2/src/main/resources/org/apache/tuscany/sca/binding/ws/axis2/engine/config/modules/modules.list Tue Jun 10 23:59:07 2008
@@ -1 +1 @@
-rampart-1.3.mar
\ No newline at end of file
+rampart-1.4.mar
\ No newline at end of file
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/contribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/contribution/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/contribution/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/contribution/pom.xml Tue Jun 10 23:59:07 2008
@@ -49,7 +49,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.03</version>
+ <version>1.3.04</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/databinding-axiom/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/databinding-axiom/pom.xml Tue Jun 10 23:59:07 2008
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/databinding-jaxb-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/databinding-jaxb-axiom/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/databinding-jaxb-axiom/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/databinding-jaxb-axiom/pom.xml Tue Jun 10 23:59:07 2008
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/databinding-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/databinding-json/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/databinding-json/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/databinding-json/pom.xml Tue Jun 10 23:59:07 2008
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/databinding-sdo-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/databinding-sdo-axiom/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/databinding-sdo-axiom/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/databinding-sdo-axiom/pom.xml Tue Jun 10 23:59:07 2008
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/databinding-xstream/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/databinding-xstream/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/databinding-xstream/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/databinding-xstream/pom.xml Tue Jun 10 23:59:07 2008
@@ -61,7 +61,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/domain-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/domain-impl/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/domain-impl/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/domain-impl/pom.xml Tue Jun 10 23:59:07 2008
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/implementation-script/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/implementation-script/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/implementation-script/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/implementation-script/pom.xml Tue Jun 10 23:59:07 2008
@@ -74,13 +74,13 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/pom.xml Tue Jun 10 23:59:07 2008
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>commons-codec</groupId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
Copied: incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/TestJavaInterface.java (from r666007, incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/TestJavaInterface.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/TestJavaInterface.java?p2=incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/TestJavaInterface.java&p1=incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/TestJavaInterface.java&r1=666007&r2=666542&rev=666542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/TestJavaInterface.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/iface/TestJavaInterface.java Tue Jun 10 23:59:07 2008
@@ -17,11 +17,14 @@
* under the License.
*/
-package org.apache.tuscany.sca.interfacedef.wsdl;
+package org.apache.tuscany.sca.interfacedef.wsdl.iface;
import javax.jws.WebMethod;
import javax.jws.WebService;
+import org.apache.tuscany.sca.interfacedef.wsdl.TestException;
+import org.apache.tuscany.sca.interfacedef.wsdl.TestFault;
+import org.apache.tuscany.sca.interfacedef.wsdl.TestJavaClass;
import org.osoa.sca.annotations.OneWay;
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/interface2wsdl/Java2WSDLGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/interface2wsdl/Java2WSDLGeneratorTestCase.java?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/interface2wsdl/Java2WSDLGeneratorTestCase.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/interface2wsdl/Java2WSDLGeneratorTestCase.java Tue Jun 10 23:59:07 2008
@@ -32,8 +32,8 @@
import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
import org.apache.tuscany.sca.interfacedef.wsdl.DefaultWSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.TestJavaInterface;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
+import org.apache.tuscany.sca.interfacedef.wsdl.iface.TestJavaInterface;
import org.apache.tuscany.sca.xsd.DefaultXSDFactory;
import org.apache.tuscany.sca.xsd.xml.XSDModelResolver;
import org.junit.Test;
@@ -56,6 +56,7 @@
DefaultXSDFactory factory = new DefaultXSDFactory();
Interface2WSDLGenerator generator = new Interface2WSDLGenerator(false, new XSDModelResolver(null, null), dataBindings, factory);
Definition definition = generator.generate(iface, wsdlDefinition);
+ definition.addNamespace("xxx", "http://wsdl.interfacedef.sca.tuscany.apache.org/");
// print the generated WSDL file and inline schemas
WSDLWriter writer = generator.getFactory().newWSDLWriter();
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl-java2wsdl/src/test/java/org/apache/tuscany/sca/interfacedef/wsdl/java2wsdl/Java2WSDLHelperTestCase.java Tue Jun 10 23:59:07 2008
@@ -36,10 +36,10 @@
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceContract;
import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSFaultExceptionMapper;
import org.apache.tuscany.sca.interfacedef.java.jaxws.JAXWSJavaInterfaceProcessor;
-import org.apache.tuscany.sca.interfacedef.wsdl.TestJavaInterface;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
+import org.apache.tuscany.sca.interfacedef.wsdl.iface.TestJavaInterface;
import org.apache.tuscany.sca.xsd.XSDFactory;
import org.apache.tuscany.sca.xsd.xml.XSDModelResolver;
import org.osoa.sca.annotations.Remotable;
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/interface-wsdl/pom.xml Tue Jun 10 23:59:07 2008
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/node-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/node-impl/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/node-impl/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/node-impl/pom.xml Tue Jun 10 23:59:07 2008
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/policy-security-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/policy-security-ws/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/policy-security-ws/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/policy-security-ws/pom.xml Tue Jun 10 23:59:07 2008
@@ -64,7 +64,7 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
@@ -85,13 +85,13 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml-ws/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml-ws/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml-ws/pom.xml Tue Jun 10 23:59:07 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/policy-xml/pom.xml Tue Jun 10 23:59:07 2008
@@ -44,7 +44,7 @@
<!--dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/runtime/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/runtime/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/runtime/pom.xml Tue Jun 10 23:59:07 2008
@@ -359,7 +359,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.2</version>
+ <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/xsd-xml/src/test/java/org/apache/tuscany/sca/xsd/xml/XSDDocumentProcessorTestCase.java Tue Jun 10 23:59:07 2008
@@ -76,15 +76,12 @@
XmlSchemaType type =
((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
Assert.assertNotNull(type);
- resolver.addModel(definition1);
resolved = resolver.resolveModel(XSDefinition.class, definition);
collection = resolved.getSchema().getIncludes();
- Assert.assertTrue(collection.getCount() == 2);
+ Assert.assertTrue(collection.getCount() == 1);
XmlSchemaType type1 =
((XmlSchemaInclude)collection.getItem(0)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
- XmlSchemaType type2 =
- ((XmlSchemaInclude)collection.getItem(1)).getSchema().getTypeByName(new QName("http://greeting", "Name"));
- Assert.assertTrue(type1 != null || type2 != null);
+ Assert.assertTrue(type1 != null);
}
}
Modified: incubator/tuscany/sandbox/axis2-1.4/modules/xsd/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/modules/xsd/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/modules/xsd/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/modules/xsd/pom.xml Tue Jun 10 23:59:07 2008
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-reference-secure/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-reference-secure/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-reference-secure/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-reference-secure/pom.xml Tue Jun 10 23:59:07 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-service-secure/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-service-secure/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-service-secure/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/samples/helloworld-ws-service-secure/pom.xml Tue Jun 10 23:59:07 2008
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>1.5.3</version>
+ <version>1.5.4</version>
</dependency>
<dependency>
Modified: incubator/tuscany/sandbox/axis2-1.4/tools/eclipse/plugins/core/.classpath
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/tools/eclipse/plugins/core/.classpath?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/tools/eclipse/plugins/core/.classpath (original)
+++ incubator/tuscany/sandbox/axis2-1.4/tools/eclipse/plugins/core/.classpath Tue Jun 10 23:59:07 2008
@@ -2,55 +2,55 @@
<classpathentry kind="src" path="."/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/ui/3.2.100-v20070531-1800/ui-3.2.100-v20070531-1800.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/ide/3.3.0-I20070531-1800/ide-3.3.0-I20070531-1800.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/resources/3.3.0-v20070530/resources-3.3.0-v20070530.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/expressions/3.3.0-v20070531-1300/expressions-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/runtime/3.3.100-v20070530/runtime-3.3.100-v20070530.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/osgi/3.3.0-v20070530/osgi-3.3.0-v20070530.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/app/1.0.0-v20070423/app-1.0.0-v20070423.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/commands/3.3.0-I20070523-1500/commands-3.3.0-I20070523-1500.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/common/3.3.0-v20070426/common-3.3.0-v20070426.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/jobs/3.3.0-v20070423/jobs-3.3.0-v20070423.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/registry/3.3.0-v20070522/registry-3.3.0-v20070522.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/preferences/3.2.100-v20070522/preferences-3.2.100-v20070522.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/compare/3.3.0-I20070528/compare-3.3.0-I20070528.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/update/configurator/3.2.100-v20070507/configurator-3.2.100-v20070507.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/console/3.2.0-v20070530/console-3.2.0-v20070530.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/core/contenttype/3.2.100-v20070319/contenttype-3.2.100-v20070319.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/app/1.0.0-v20070423/app-1.0.0-v20070423.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/debug/core/3.3.0-v20070531-1800/core-3.3.0-v20070531-1800.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.3.0-v_768/core-3.3.0-v_768.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/team/core/3.2.100-I20070531/core-3.2.100-I20070531.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/update/core/3.2.100-v20070522/core-3.2.100-v20070522.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/databinding/1.0.0-I20070530-0100/databinding-1.0.0-I20070530-0100.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/databinding/1.1.0-I20070530-0100/databinding-1.1.0-I20070530-0100.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/3.3.0-v20070530a/debug-3.3.0-v20070530a.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/editors/3.3.0-v20070531-1300/editors-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/expressions/3.3.0-v20070531-1300/expressions-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/filebuffers/3.3.0-v20070531-1300/filebuffers-3.3.0-v20070531-1300.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/core/filesystem/1.1.0-v20070510/filesystem-1.1.0-v20070510.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/forms/3.3.0-v20070511/forms-3.3.0-v20070511.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/help/3.3.0-v20070524/help-3.3.0-v20070524.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/3.3.0-I20070601-1200/ui-3.3.0-I20070601-1200.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/swt/3.3.0-v3345b/swt-3.3.0-v3345b.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/ide/3.3.0-I20070531-1800/ide-3.3.0-I20070531-1800.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jface/3.3.0-I20070601-1200/jface-3.3.0-I20070601-1200.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/commands/3.3.0-I20070523-1500/commands-3.3.0-I20070523-1500.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/workbench/3.3.0-I20070601-0010/workbench-3.3.0-I20070601-0010.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/databinding/1.1.0-I20070530-0100/databinding-1.1.0-I20070530-0100.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/databinding/1.0.0-I20070530-0100/databinding-1.0.0-I20070530-0100.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/3.2.100-I20070319-0010/views-3.2.100-I20070319-0010.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/update/configurator/3.2.100-v20070507/configurator-3.2.100-v20070507.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/update/core/3.2.100-v20070522/core-3.2.100-v20070522.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/jobs/3.3.0-v20070423/jobs-3.3.0-v20070423.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/launching/3.3.0-v20070510/launching-3.3.0-v20070510.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/manipulation/1.1.0-v20070531-1300/manipulation-1.1.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/3.3.0-I20070531-1800/navigator-3.3.0-I20070531-1800.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/core/net/1.0.0-I20070531/net-1.0.0-I20070531.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/update/ui/3.2.100-v20070601a/ui-3.2.100-v20070601a.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/forms/3.3.0-v20070511/forms-3.3.0-v20070511.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/text/3.3.0-v20070531-1300/text-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/osgi/3.3.0-v20070530/osgi-3.3.0-v20070530.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/preferences/3.2.100-v20070522/preferences-3.2.100-v20070522.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/core/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/ui/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/equinox/registry/3.3.0-v20070522/registry-3.3.0-v20070522.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/resources/3.3.0-v20070530/resources-3.3.0-v20070530.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/resources/3.2.100-I20070530-0100/resources-3.2.100-I20070530-0100.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/runtime/3.3.100-v20070530/runtime-3.3.100-v20070530.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/search/3.3.0-v20070531-1300/search-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/swt/3.3.0-v3345b/swt-3.3.0-v3345b.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/properties/tabbed/3.2.100-I20070424-0010/tabbed-3.2.100-I20070424-0010.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/text/3.3.0-v20070531-1300/text-3.3.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jface/text/3.3.0-v20070531-1300/text-3.3.0-v20070531-1300.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/ui/workbench/texteditor/3.3.0-v20070531-1300/texteditor-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/editors/3.3.0-v20070531-1300/editors-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/filebuffers/3.3.0-v20070531-1300/filebuffers-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/core/variables/3.2.0-v20070426/variables-3.2.0-v20070426.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.3.0-v_768/core-3.3.0-v_768.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/3.3.0-I20070601-1200/ui-3.3.0-I20070601-1200.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/debug/ui/3.3.0-v20070531-1800/ui-3.3.0-v20070531-1800.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/console/3.2.0-v20070530/console-3.2.0-v20070530.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/debug/core/3.3.0-v20070531-1800/core-3.3.0-v20070531-1800.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/3.3.0-v20070530a/debug-3.3.0-v20070530a.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/launching/3.3.0-v20070510/launching-3.3.0-v20070510.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/ui/3.3.0-v20070531-1300/ui-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/search/3.3.0-v20070531-1300/search-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/compare/3.3.0-I20070528/compare-3.3.0-I20070528.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/debug/ui/3.2.100-v20070531-1800/ui-3.2.100-v20070531-1800.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/team/ui/3.3.0-I20070524/ui-3.3.0-I20070524.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/team/core/3.2.100-I20070531/core-3.2.100-I20070531.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/3.3.0-I20070531-1800/navigator-3.3.0-I20070531-1800.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/navigator/resources/3.2.100-I20070530-0100/resources-3.2.100-I20070530-0100.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/properties/tabbed/3.2.100-I20070424-0010/tabbed-3.2.100-I20070424-0010.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/core/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/ltk/ui/refactoring/3.3.0-v20070531-1300/refactoring-3.3.0-v20070531-1300.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/manipulation/1.1.0-v20070531-1300/manipulation-1.1.0-v20070531-1300.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/update/ui/3.2.100-v20070601a/ui-3.2.100-v20070601a.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/core/variables/3.2.0-v20070426/variables-3.2.0-v20070426.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/views/3.2.100-I20070319-0010/views-3.2.100-I20070319-0010.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/ui/workbench/3.3.0-I20070601-0010/workbench-3.3.0-I20070601-0010.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/swt/win32/win32/x86/3.3.0-v3346/x86-3.3.0-v3346.jar"/>
</classpath>
\ No newline at end of file
Modified: incubator/tuscany/sandbox/axis2-1.4/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/tools/java2wsdl/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/tools/java2wsdl/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/tools/java2wsdl/pom.xml Tue Jun 10 23:59:07 2008
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -90,7 +90,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -102,13 +102,13 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
@@ -166,6 +166,13 @@
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/pom.xml?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/pom.xml (original)
+++ incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/pom.xml Tue Jun 10 23:59:07 2008
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
- <version>2.0.2</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>wsdl4j</groupId>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- <version>1.3.2</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
@@ -117,7 +117,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
@@ -130,13 +130,13 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.5</version>
+ <version>1.2.7</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-java2wsdl</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.ant</groupId>
@@ -160,7 +160,7 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<dependency>
@@ -194,7 +194,12 @@
<scope>runtime</scope>
</dependency>
-
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java?rev=666542&r1=666541&r2=666542&view=diff
==============================================================================
--- incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java (original)
+++ incubator/tuscany/sandbox/axis2-1.4/tools/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java Tue Jun 10 23:59:07 2008
@@ -26,6 +26,7 @@
import javax.xml.namespace.QName;
+import org.apache.axis2.description.AxisBindingOperation;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.util.FileWriter;
@@ -129,20 +130,20 @@
}
@Override
- protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+ protected Element getInputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
return getElement(doc,
"input",
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_IN_VALUE).isWrapped(),
headerParameterQNameList);
}
@Override
- protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
+ protected Element getOutputElement(Document doc, AxisBindingOperation operation, List headerParameterQNameList) {
return getElement(doc,
"output",
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
- operation.getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE),
+ operation.getAxisOperation().getMessage(WSDLConstants.MESSAGE_LABEL_OUT_VALUE).isWrapped(),
headerParameterQNameList);
}