You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/12/19 10:40:18 UTC
svn commit: r488598 - in /webservices/axis2/trunk/java/modules: jaxws/
jaxws/src/org/apache/axis2/jaxws/
jaxws/src/org/apache/axis2/jaxws/client/proxy/
jaxws/src/org/apache/axis2/jaxws/description/
jaxws/src/org/apache/axis2/jaxws/i18n/ jaxws/src/org/a...
Author: dims
Date: Tue Dec 19 01:40:15 2006
New Revision: 488598
URL: http://svn.apache.org/viewvc?view=rev&rev=488598
Log:
first pass, splitting metadata related code from jaxws (Needs a lot more work!!). Compiles ok and tests run ok.
Added:
webservices/axis2/trunk/java/modules/metadata/
webservices/axis2/trunk/java/modules/metadata/maven.xml
webservices/axis2/trunk/java/modules/metadata/project.properties
webservices/axis2/trunk/java/modules/metadata/project.xml
webservices/axis2/trunk/java/modules/metadata/src/
webservices/axis2/trunk/java/modules/metadata/src/org/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java (contents, props changed)
- copied, changed from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java (contents, props changed)
- copied, changed from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ExceptionFactory.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/
- copied from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/EndpointDescription.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/EndpointDescription.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java
- copied, changed from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescriptionJava.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescriptionJava.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/ServiceDescription.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/ServiceDescription.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/HandlerChainAnnot.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/HandlerChainAnnot.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/MDQConstants.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/MDQConstants.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/ParameterDescriptionComposite.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/ServiceModeAnnot.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/ServiceModeAnnot.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/SoapBindingAnnot.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/SoapBindingAnnot.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/builder/WebParamAnnot.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/builder/WebParamAnnot.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/DescriptionFactoryImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/DescriptionUtils.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/EndpointInterfaceDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/FaultDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
- copied, changed from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/PackageSetBuilder.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/PackageSetBuilder.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/ServiceDescriptionImpl.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/validator/EndpointDescriptionValidator.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/validator/EndpointDescriptionValidator.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/validator/EndpointInterfaceDescriptionValidator.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/validator/EndpointInterfaceDescriptionValidator.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/validator/OperationDescriptionValidator.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/validator/OperationDescriptionValidator.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/validator/ServiceDescriptionValidator.java
- copied unchanged from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/validator/ServiceDescriptionValidator.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/i18n/
- copied from r488597, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java (contents, props changed)
- copied, changed from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageException.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java (contents, props changed)
- copied, changed from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageInternalException.java
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/util/
- copied from r488597, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/util/
webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/wsdl/
- copied from r488597, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/wsdl/
Removed:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ExceptionFactory.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/i18n/
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageException.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageInternalException.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/util/
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/wsdl/
Modified:
webservices/axis2/trunk/java/modules/jaxws/maven.xml
webservices/axis2/trunk/java/modules/jaxws/project.xml
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
Modified: webservices/axis2/trunk/java/modules/jaxws/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/maven.xml?view=diff&rev=488598&r1=488597&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/maven.xml Tue Dec 19 01:40:15 2006
@@ -40,7 +40,7 @@
<ant:echo>Generating java from echo.xsd</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet ${schema.source.dir}/echo.xsd"/>
@@ -48,7 +48,7 @@
<ant:echo>Generating java from stock1.xsd</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet ${schema.source.dir}/stock1.xsd"/>
@@ -56,7 +56,7 @@
<ant:echo>Generating java from stock2.xsd</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet ${schema.source.dir}/stock2.xsd"/>
@@ -64,7 +64,7 @@
<ant:echo>Generating java from samplemtom.xsd</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet ${schema.source.dir}/samplemtom.xsd"/>
@@ -72,7 +72,7 @@
<ant:echo>Generating java from ProxyDocLitWrapped.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -p org.test.proxy.doclitwrapped -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitWrapped.wsdl"/>
@@ -80,7 +80,7 @@
<ant:echo>Generating java from ProxyDocLitnonWrapped.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitnonWrapped.wsdl"/>
@@ -88,7 +88,7 @@
<ant:echo>Generating java from RPCLit.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -p org.test.proxy.rpclit -quiet -wsdl ${wsdl.source.dir}/RPCLit.wsdl"/>
@@ -96,7 +96,7 @@
<ant:echo>Generating java from gorilla_dlw.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/gorilla_dlw.wsdl"/>
@@ -104,7 +104,7 @@
<ant:echo>Generating java from SOAP12Echo.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/SOAP12Echo.wsdl"/>
@@ -112,14 +112,14 @@
<ant:echo>Generating java from AddNumbers.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/AddNumbers.wsdl"/>
</java>
<ant:echo>Generating java from async_doclitwr.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/async_doclitwr.wsdl"/>
@@ -127,7 +127,7 @@
<ant:echo>Generating java from FaultyWebService.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/FaultyWebService.wsdl"/>
@@ -135,7 +135,7 @@
<ant:echo>Generating java from FaultsService.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/FaultsService.wsdl"/>
@@ -143,7 +143,7 @@
<ant:echo>Generating java from jaxbsource</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -p org.test.dispatch.jaxbsource ${schema.source.dir}/jaxbsource.xsd"/>
@@ -151,7 +151,7 @@
<ant:echo>Generating java from doclit_nonwrap.wsdl for javabean endpoint support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/doclit_nonwrap.wsdl"/>
@@ -159,7 +159,7 @@
<ant:echo>Generating java from doclitwrap.wsdl for javabean endpoint support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/doclitwrap.wsdl"/>
@@ -167,7 +167,7 @@
<ant:echo>Generating java from doclitbare.wsdl for javabean endpoint support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/doclitbare.wsdl"/>
@@ -175,7 +175,7 @@
<ant:echo>Generating java from EchoMessage.wsdl for javabean endpoint support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/EchoMessage.wsdl"/>
@@ -183,7 +183,7 @@
<ant:echo>Generating java from resourceinjection.wsdl for javabean endpoint Resource Injection support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/resourceinjection.wsdl"/>
@@ -191,7 +191,7 @@
<ant:echo>Generating java from AnyType.wsdl for javabean endpoint AnyType support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/AnyType.wsdl"/>
@@ -199,7 +199,7 @@
<ant:echo>Generating java from WSDLMultiTests.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/WSDLMultiTests.wsdl"/>
@@ -207,7 +207,7 @@
<ant:echo>Generating java from Polymorphic shapes.wsdl for javabean endpoint support</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/shapes.wsdl"/>
@@ -215,7 +215,7 @@
<ant:echo>Generating java from SOAPActionTest.wsdl</ant:echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
+ <jvmarg line="${maven.junit.jvmargs2}"/>
<classpath refid="maven.dependency.classpath"/>
<classpath location="${compiled.classes.dir}"/>
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/SOAPActionTest.wsdl"/>
@@ -711,16 +711,4 @@
</ant:sourcepath>
</ant:javadoc>
</goal>
-
- <postGoal name="java:jar-resources">
- <tstamp>
- <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en"/>
- </tstamp>
- <replace dir="${maven.build.dest}/org/apache/axis2/jaxws/i18n">
- <include name="resource*.properties"/>
- <replacefilter token="#today#" value="${build.time}"/>
- <replacefilter token="#axisVersion#" value="${pom.currentVersion}"/>
- </replace>
- </postGoal>
-
</project>
Modified: webservices/axis2/trunk/java/modules/jaxws/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/project.xml?view=diff&rev=488598&r1=488597&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/project.xml Tue Dec 19 01:40:15 2006
@@ -174,6 +174,11 @@
<artifactId>axis2-jaxws-api</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-metadata</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java?view=diff&rev=488598&r1=488597&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/client/proxy/JAXWSProxyHandler.java Tue Dec 19 01:40:15 2006
@@ -40,6 +40,7 @@
import org.apache.axis2.jaxws.description.OperationDescription;
import org.apache.axis2.jaxws.description.ServiceDescription;
import org.apache.axis2.jaxws.i18n.Messages;
+import org.apache.axis2.jaxws.marshaller.factory.MethodMarshallerFactory;
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.spi.ServiceDelegate;
import org.apache.commons.logging.Log;
@@ -287,7 +288,7 @@
OperationDescription operationDesc = endpointDesc.getEndpointInterfaceDescription().getOperation(method);
- Message message = operationDesc.getMarshaller(true).marshalRequest(args, operationDesc);
+ Message message = MethodMarshallerFactory.getMarshaller(operationDesc, true).marshalRequest(args, operationDesc);
if (log.isDebugEnabled()) {
log.debug("Objects converted to Message");
@@ -314,7 +315,7 @@
log.debug("Converting Message to Response Object");
}
if (responseMsg.isFault()) {
- Object object = operationDesc.getMarshaller(false).demarshalFaultResponse(responseMsg, operationDesc);
+ Object object = MethodMarshallerFactory.getMarshaller(operationDesc, false).demarshalFaultResponse(responseMsg, operationDesc);
if (log.isDebugEnabled()) {
log.debug("Message Converted to response Throwable. Throwing back to client.");
}
@@ -324,7 +325,7 @@
// use the factory, it'll throw the right thing:
throw ExceptionFactory.makeWebServiceException(responseContext.getLocalException());
}
- Object object = operationDesc.getMarshaller(false).demarshalResponse(responseMsg, args, operationDesc);
+ Object object = MethodMarshallerFactory.getMarshaller(operationDesc, false).demarshalResponse(responseMsg, args, operationDesc);
if (log.isDebugEnabled()) {
log.debug("Message Converted to response Object");
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java?view=diff&rev=488598&r1=488597&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/factory/MethodMarshallerFactory.java Tue Dec 19 01:40:15 2006
@@ -25,6 +25,7 @@
import org.apache.axis2.jaxws.marshaller.impl.alt.DocLitBareMethodMarshaller;
import org.apache.axis2.jaxws.marshaller.impl.alt.DocLitWrappedMethodMarshaller;
import org.apache.axis2.jaxws.marshaller.impl.alt.RPCLitMethodMarshaller;
+import org.apache.axis2.jaxws.description.OperationDescription;
/**
* The MethodMarshallerFactory creates a Doc/Lit Wrapped, Doc/Lit Bare or RPC Marshaller using SOAPBinding information
@@ -80,4 +81,60 @@
}
return null;
}
+
+ public static MethodMarshaller getMarshaller(OperationDescription op, boolean isClient) {
+
+ MethodMarshaller marshaller = null;
+ if (isClient) {
+ if (op.getSoapBindingStyle() == SOAPBinding.Style.DOCUMENT) {
+ marshaller = createDocLitMethodMarshaller(op, isClient);
+ } else if (op.getSoapBindingStyle() == SOAPBinding.Style.RPC) {
+ marshaller = createRPCLitMethodMarshaller(isClient);
+ }
+ } else { // SERVER
+ if (op.getSoapBindingStyle() == SOAPBinding.Style.DOCUMENT) {
+ marshaller = createDocLitMethodMarshaller(op, isClient);
+ } else if (op.getSoapBindingStyle() == SOAPBinding.Style.RPC) {
+ marshaller = createRPCLitMethodMarshaller(isClient);
+ }
+ }
+ return marshaller;
+ }
+
+ private static MethodMarshaller createDocLitMethodMarshaller(OperationDescription op, boolean isClient){
+ SOAPBinding.ParameterStyle parameterStyle = null;
+ if(isDocLitBare(op)){
+ parameterStyle = SOAPBinding.ParameterStyle.BARE;
+ }
+ if(isDocLitWrapped(op)){
+ parameterStyle = SOAPBinding.ParameterStyle.WRAPPED;
+ }
+ return createMethodMarshaller(SOAPBinding.Style.DOCUMENT, parameterStyle, isClient);
+ }
+
+ private static MethodMarshaller createRPCLitMethodMarshaller(boolean isClient){
+ return createMethodMarshaller(SOAPBinding.Style.RPC, SOAPBinding.ParameterStyle.WRAPPED, isClient);
+ }
+
+ protected static boolean isDocLitBare(OperationDescription op){
+ SOAPBinding.ParameterStyle methodParamStyle = op.getSoapBindingParameterStyle();
+ if(methodParamStyle!=null){
+ return methodParamStyle == SOAPBinding.ParameterStyle.BARE;
+ }
+ else{
+ SOAPBinding.ParameterStyle SEIParamStyle = op.getEndpointInterfaceDescription().getSoapBindingParameterStyle();
+ return SEIParamStyle == SOAPBinding.ParameterStyle.BARE;
+ }
+ }
+
+ protected static boolean isDocLitWrapped(OperationDescription op){
+ SOAPBinding.ParameterStyle methodParamStyle = op.getSoapBindingParameterStyle();
+ if(methodParamStyle!=null){
+ return methodParamStyle == SOAPBinding.ParameterStyle.WRAPPED;
+ }
+ else{
+ SOAPBinding.ParameterStyle SEIParamStyle = op.getEndpointInterfaceDescription().getSoapBindingParameterStyle();
+ return SEIParamStyle == SOAPBinding.ParameterStyle.WRAPPED;
+ }
+ }
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java?view=diff&rev=488598&r1=488597&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/JavaBeanDispatcher.java Tue Dec 19 01:40:15 2006
@@ -30,6 +30,7 @@
import org.apache.axis2.jaxws.description.ServiceDescription;
import org.apache.axis2.jaxws.i18n.Messages;
import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
+import org.apache.axis2.jaxws.marshaller.factory.MethodMarshallerFactory;
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.message.Protocol;
import org.apache.commons.logging.Log;
@@ -189,38 +190,8 @@
if(styleOnMethod!=null && styleOnSEI!=styleOnMethod){
throw ExceptionFactory.makeWebServiceException(Messages.getMessage("proxyErr2"));
}
- return operationDesc.getMarshaller(false);
-
- /*
- MethodMarshallerFactory cf = (MethodMarshallerFactory) FactoryRegistry.getFactory(MethodMarshallerFactory.class);
-
- if(styleOnSEI == javax.jws.soap.SOAPBinding.Style.DOCUMENT){
- return createDocLitMessageConvertor(cf, operationDesc);
- }
- if(styleOnSEI == javax.jws.soap.SOAPBinding.Style.RPC){
- return createRPCLitMessageConvertor(cf);
-
- }
- return null;
- */
+ return MethodMarshallerFactory.getMarshaller(operationDesc, false);
}
-
- /*
- private MethodMarshaller createDocLitMessageConvertor(MethodMarshallerFactory cf, OperationDescription operationDesc){
- ParameterStyle parameterStyle = null;
- if(isDocLitBare(endpointDesc, operationDesc)){
- parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.BARE;
- }
- if(isDocLitWrapped(endpointDesc, operationDesc)){
- parameterStyle = javax.jws.soap.SOAPBinding.ParameterStyle.WRAPPED;
- }
- return cf.createMethodMarshaller(Style.DOCUMENT, parameterStyle, false);
- }
-
- private MethodMarshaller createRPCLitMessageConvertor(MethodMarshallerFactory cf){
- return cf.createMethodMarshaller(Style.RPC, ParameterStyle.WRAPPED, false);
- }
- */
public Method getJavaMethod(MessageContext mc, Class serviceImplClass) {
QName opName = mc.getOperationName();
Added: webservices/axis2/trunk/java/modules/metadata/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/maven.xml?view=auto&rev=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/maven.xml (added)
+++ webservices/axis2/trunk/java/modules/metadata/maven.xml Tue Dec 19 01:40:15 2006
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
+ xmlns:deploy="deploy"
+ xmlns:ant="jelly:ant">
+
+ <preGoal name="itest:compile">
+ <u:file var="file" name="${maven.itest.src}"/>
+ <j:if test="${!file.exists()}">
+ <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+ </j:if>
+ </preGoal>
+
+ <postGoal name="java:jar-resources">
+ <tstamp>
+ <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en"/>
+ </tstamp>
+ <replace dir="${maven.build.dest}/org/apache/axis2/jaxws/i18n">
+ <include name="resource*.properties"/>
+ <replacefilter token="#today#" value="${build.time}"/>
+ <replacefilter token="#axisVersion#" value="${pom.currentVersion}"/>
+ </replace>
+ </postGoal>
+</project>
Added: webservices/axis2/trunk/java/modules/metadata/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/project.properties?view=auto&rev=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/project.properties (added)
+++ webservices/axis2/trunk/java/modules/metadata/project.properties Tue Dec 19 01:40:15 2006
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed 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.
+# -------------------------------------------------------------------
+
+maven.multiproject.type=jar
+
+# -------------------------------------------------------------------
+# JUnit
+# -------------------------------------------------------------------
+maven.junit.jvmargs=-Xmx256m -Djava.awt.headless=true -Dbuild.repository=./target/test-classes
+maven.junit.fork=true
+
+# -------------------------------------------------------------------
+# Test
+# -------------------------------------------------------------------
+maven.test.failure.ignore=true
+
+# -------------------------------------------------------------------
+# Compile
+# -------------------------------------------------------------------
+maven.compile.optimize=false
+maven.compile.fork=true
+maven.compile.target=1.5
+maven.compile.source=1.5
+
+jaxws.version=${pom.currentVersion}
Added: webservices/axis2/trunk/java/modules/metadata/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/project.xml?view=auto&rev=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/project.xml (added)
+++ webservices/axis2/trunk/java/modules/metadata/project.xml Tue Dec 19 01:40:15 2006
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+ -->
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>../../etc/project.xml</extend>
+
+ <name>Apache Axis 2.0 - Metadata</name>
+ <id>axis2-metadata</id>
+ <groupId>org.apache.axis2</groupId>
+ <description>JSR-181 and JSR-224 Annotations Processing</description>
+
+ <!-- ========== -->
+ <!-- Developers -->
+ <!-- ========== -->
+ <developers>
+ <developer>
+ <name>Nicholas Gallardo</name>
+ <organization>IBM</organization>
+ </developer>
+ <developer>
+ <name>Rich Scheuerle</name>
+ <id>scheu</id>
+ <email>scheu AT us.ibm.com</email>
+ <organization>IBM</organization>
+ </developer>
+ <developer>
+ <name>Jeff Barrett</name>
+ <organization>IBM</organization>
+ </developer>
+ <developer>
+ <name>Nikhil Thaker</name>
+ <organization>IBM</organization>
+ </developer>
+ <developer>
+ <name>Michael Rheinheimer</name>
+ <organization>IBM</organization>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Brent Ulbricht</name>
+ <organization>IBM</organization>
+ </contributor>
+ <contributor>
+ <name>Dan Sedov</name>
+ <organization>IBM</organization>
+ </contributor>
+ <contributor>
+ <name>Lizet Ernand</name>
+ <organization>IBM</organization>
+ </contributor>
+ <contributor>
+ <name>Samual Isokpunwu</name>
+ <organization>IBM</organization>
+ </contributor>
+ </contributors>
+ <build>
+ <defaultGoal>jar</defaultGoal>
+ <nagEmailAddress></nagEmailAddress>
+ <sourceDirectory>src</sourceDirectory>
+ <unitTestSourceDirectory>test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+
+ <resources>
+ <resource>
+ <directory>${basedir}/test-resources</directory>
+ </resource>
+ <resource>
+ <directory>conf</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
+
+ </build>
+
+ <reports>
+ <report>maven-junit-report-plugin</report>
+ </reports>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxbri.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>${jaxbri.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxbri.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${axiom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj-api</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-api</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <properties>
+ <module>false</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javamail.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${axiom.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${axiom.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${XmlSchema.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml_apis.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>${xmlunit.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>httpcomponents-httpcore</groupId>
+ <artifactId>jakarta-httpcore</artifactId>
+ <version>${jakarta.httpcore.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ </dependencies>
+</project>
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java (from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java&r1=488498&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java&r2=488598
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ClientConfigurationFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java (from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ExceptionFactory.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/ExceptionFactory.java&r1=488499&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java&r2=488598
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/ExceptionFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java (from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java&r1=488499&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/OperationDescription.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/OperationDescription.java Tue Dec 19 01:40:15 2006
@@ -22,7 +22,6 @@
import javax.xml.namespace.QName;
import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
/**
* An OperationDescripton corresponds to a method on an SEI. That SEI could be explicit
@@ -109,8 +108,6 @@
public String getResponseWrapperLocalName();
public String[] getParamNames();
-
- public MethodMarshaller getMarshaller(boolean isClient);
// TODO: These should return Enums defined on this interface, not from the Annotation
public javax.jws.soap.SOAPBinding.ParameterStyle getSoapBindingParameterStyle();
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (from r488499, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java&r1=488499&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java&r2=488598
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java (original)
+++ webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/description/impl/OperationDescriptionImpl.java Tue Dec 19 01:40:15 2006
@@ -32,7 +32,6 @@
import javax.jws.WebParam.Mode;
import javax.jws.WebResult;
import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.RequestWrapper;
@@ -56,8 +55,6 @@
import org.apache.axis2.jaxws.description.builder.MethodDescriptionComposite;
import org.apache.axis2.jaxws.description.builder.OneWayAnnot;
import org.apache.axis2.jaxws.description.builder.ParameterDescriptionComposite;
-import org.apache.axis2.jaxws.marshaller.MethodMarshaller;
-import org.apache.axis2.jaxws.marshaller.factory.MethodMarshallerFactory;
import org.apache.axis2.wsdl.WSDLConstants;
/**
@@ -84,10 +81,6 @@
private ParameterDescription[] parameterDescriptions;
private FaultDescription[] faultDescriptions;
- // cache the marshallers in use for this operation:
- private MethodMarshaller clientMarshaller = null;
- private MethodMarshaller serverMarshaller = null;
-
// ===========================================
// ANNOTATION related information
// ===========================================
@@ -801,74 +794,7 @@
// REVIEW: WSDL/Anno merge
return getAnnoWebParamNames();
}
-
- public MethodMarshaller getMarshaller(boolean isClient) {
-
- MethodMarshaller marshaller = null;
- if (isClient) {
- if (clientMarshaller != null) {
- marshaller = clientMarshaller;
- } else {
- if (this.getSoapBindingStyle() == SOAPBinding.Style.DOCUMENT) {
- clientMarshaller = createDocLitMethodMarshaller(isClient);
- } else if (this.getSoapBindingStyle() == SOAPBinding.Style.RPC) {
- clientMarshaller = createRPCLitMethodMarshaller(isClient);
- }
- marshaller = clientMarshaller;
- }
- } else { // SERVER
- if (serverMarshaller != null) {
- marshaller = serverMarshaller;
- } else {
- if (this.getSoapBindingStyle() == SOAPBinding.Style.DOCUMENT) {
- serverMarshaller = createDocLitMethodMarshaller(isClient);
- } else if (this.getSoapBindingStyle() == SOAPBinding.Style.RPC) {
- serverMarshaller = createRPCLitMethodMarshaller(isClient);
- }
- marshaller = serverMarshaller;
- }
- }
- return marshaller;
- }
-
- private MethodMarshaller createDocLitMethodMarshaller(boolean isClient){
- ParameterStyle parameterStyle = null;
- if(isDocLitBare()){
- parameterStyle = SOAPBinding.ParameterStyle.BARE;
- }
- if(isDocLitWrapped()){
- parameterStyle = SOAPBinding.ParameterStyle.WRAPPED;
- }
- return MethodMarshallerFactory.createMethodMarshaller(SOAPBinding.Style.DOCUMENT, parameterStyle, isClient);
- }
-
- private MethodMarshaller createRPCLitMethodMarshaller(boolean isClient){
- return MethodMarshallerFactory.createMethodMarshaller(SOAPBinding.Style.RPC, SOAPBinding.ParameterStyle.WRAPPED, isClient);
- }
-
- protected boolean isDocLitBare(){
- SOAPBinding.ParameterStyle methodParamStyle = this.getSoapBindingParameterStyle();
- if(methodParamStyle!=null){
- return methodParamStyle == SOAPBinding.ParameterStyle.BARE;
- }
- else{
- SOAPBinding.ParameterStyle SEIParamStyle = this.getEndpointInterfaceDescription().getSoapBindingParameterStyle();
- return SEIParamStyle == SOAPBinding.ParameterStyle.BARE;
- }
- }
-
- protected boolean isDocLitWrapped(){
- SOAPBinding.ParameterStyle methodParamStyle = this.getSoapBindingParameterStyle();
- if(methodParamStyle!=null){
- return methodParamStyle == SOAPBinding.ParameterStyle.WRAPPED;
- }
- else{
- SOAPBinding.ParameterStyle SEIParamStyle = this.getEndpointInterfaceDescription().getSoapBindingParameterStyle();
- return SEIParamStyle == SOAPBinding.ParameterStyle.WRAPPED;
- }
- }
-
-
+
public String[] getAnnoWebParamNames() {
if (webParamNames == null) {
ArrayList<String> buildNames = new ArrayList<String>();
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java (from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageException.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageException.java&r1=488498&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java&r2=488598
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageException.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java (from r488498, webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageInternalException.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java?view=diff&rev=488598&p1=webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/MessageInternalException.java&r1=488498&p2=webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java&r2=488598
==============================================================================
(empty)
Propchange: webservices/axis2/trunk/java/modules/metadata/src/org/apache/axis2/jaxws/message/MessageInternalException.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org