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 2007/02/05 12:39:33 UTC
svn commit: r503649 - in /webservices/axis2/trunk/java/modules/jaxws:
pom.xml src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
Author: dims
Date: Mon Feb 5 03:39:31 2007
New Revision: 503649
URL: http://svn.apache.org/viewvc?view=rev&rev=503649
Log:
one more w2j from maven.xml
Modified:
webservices/axis2/trunk/java/modules/jaxws/pom.xml
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?view=diff&rev=503649&r1=503648&r2=503649
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Mon Feb 5 03:39:31 2007
@@ -205,6 +205,13 @@
<arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitnonWrapped.wsdl"/>
</java>
+ <echo>Generating java from samplemtomjpeg.wsdl</echo>
+ <java classname="com.sun.tools.xjc.Driver" fork="true">
+ <classpath refid="maven.runtime.classpath"/>
+ <classpath location="${compiled.classes.dir}"/>
+ <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/samplemtomjpeg.wsdl"/>
+ </java>
+
<echo>Generating java from RPCLit.wsdl</echo>
<java classname="com.sun.tools.xjc.Driver" fork="true">
<classpath refid="maven.runtime.classpath"/>
@@ -423,6 +430,20 @@
</fileset>
<fileset dir="target/schema/classes">
<include name="org/test/mtom/**"/>
+ </fileset>
+ </copy>
+ <copy toDir="target/test-classes/services/SendImageService/">
+ <fileset dir="target/test-classes">
+ <include name="org/apache/axis2/jaxws/sample/mtom1/**"/>
+ </fileset>
+ <fileset dir="test/org/apache/axis2/jaxws/sample/mtom1">
+ <include name="META-INF/**"/>
+ </fileset>
+ <fileset dir="target/classes">
+ <include name="org/apache/axis2/jaxws/server/**"/>
+ </fileset>
+ <fileset dir="target/schema/classes">
+ <include name="org/apache/axis2/jaxws/sample/mtom1/**"/>
</fileset>
</copy>
<copy toDir="target/test-classes/services/SOAP12Service/">
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?view=diff&rev=503649&r1=503648&r2=503649
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java Mon Feb 5 03:39:31 2007
@@ -33,7 +33,7 @@
import org.apache.axis2.jaxws.message.util.MessageUtils;
import org.apache.axis2.jaxws.util.Constants;
import org.apache.axis2.util.ThreadContextMigratorUtil;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004_Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -153,10 +153,10 @@
}
private boolean isMepInOnly(String mep){
- boolean inOnly = mep.equals(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_URI_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
+ boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY);
return inOnly;
}
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java?view=diff&rev=503649&r1=503648&r2=503649
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java Mon Feb 5 03:39:31 2007
@@ -49,7 +49,7 @@
import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
import org.apache.axis2.jaxws.util.ClassUtils;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
+import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004_Constants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -430,10 +430,10 @@
AxisOperation op = mc.getAxisOperation();
String mep = op.getMessageExchangePattern();
- if (mep.equals(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_URI_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY) ||
- mep.equals(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY)) {
+ if (mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
+ mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY)) {
return true;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org
Re: svn commit: r503649 - in /webservices/axis2/trunk/java/modules/jaxws: pom.xml src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
Posted by Davanum Srinivas <da...@gmail.com>.
forgot to mention. fix compile issues!
-- dims
On 2/5/07, dims@apache.org <di...@apache.org> wrote:
> Author: dims
> Date: Mon Feb 5 03:39:31 2007
> New Revision: 503649
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=503649
> Log:
> one more w2j from maven.xml
>
> Modified:
> webservices/axis2/trunk/java/modules/jaxws/pom.xml
> webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
> webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
>
> Modified: webservices/axis2/trunk/java/modules/jaxws/pom.xml
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/pom.xml?view=diff&rev=503649&r1=503648&r2=503649
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/jaxws/pom.xml (original)
> +++ webservices/axis2/trunk/java/modules/jaxws/pom.xml Mon Feb 5 03:39:31 2007
> @@ -205,6 +205,13 @@
> <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitnonWrapped.wsdl"/>
> </java>
>
> + <echo>Generating java from samplemtomjpeg.wsdl</echo>
> + <java classname="com.sun.tools.xjc.Driver" fork="true">
> + <classpath refid="maven.runtime.classpath"/>
> + <classpath location="${compiled.classes.dir}"/>
> + <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/samplemtomjpeg.wsdl"/>
> + </java>
> +
> <echo>Generating java from RPCLit.wsdl</echo>
> <java classname="com.sun.tools.xjc.Driver" fork="true">
> <classpath refid="maven.runtime.classpath"/>
> @@ -423,6 +430,20 @@
> </fileset>
> <fileset dir="target/schema/classes">
> <include name="org/test/mtom/**"/>
> + </fileset>
> + </copy>
> + <copy toDir="target/test-classes/services/SendImageService/">
> + <fileset dir="target/test-classes">
> + <include name="org/apache/axis2/jaxws/sample/mtom1/**"/>
> + </fileset>
> + <fileset dir="test/org/apache/axis2/jaxws/sample/mtom1">
> + <include name="META-INF/**"/>
> + </fileset>
> + <fileset dir="target/classes">
> + <include name="org/apache/axis2/jaxws/server/**"/>
> + </fileset>
> + <fileset dir="target/schema/classes">
> + <include name="org/apache/axis2/jaxws/sample/mtom1/**"/>
> </fileset>
> </copy>
> <copy toDir="target/test-classes/services/SOAP12Service/">
>
> Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?view=diff&rev=503649&r1=503648&r2=503649
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java (original)
> +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java Mon Feb 5 03:39:31 2007
> @@ -33,7 +33,7 @@
> import org.apache.axis2.jaxws.message.util.MessageUtils;
> import org.apache.axis2.jaxws.util.Constants;
> import org.apache.axis2.util.ThreadContextMigratorUtil;
> -import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
> +import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004_Constants;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
>
> @@ -153,10 +153,10 @@
> }
>
> private boolean isMepInOnly(String mep){
> - boolean inOnly = mep.equals(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_URI_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY);
> + boolean inOnly = mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY);
> return inOnly;
> }
>
>
> Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java?view=diff&rev=503649&r1=503648&r2=503649
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java (original)
> +++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/server/dispatcher/ProviderDispatcher.java Mon Feb 5 03:39:31 2007
> @@ -49,7 +49,7 @@
> import org.apache.axis2.jaxws.message.factory.XMLStringBlockFactory;
> import org.apache.axis2.jaxws.registry.FactoryRegistry;
> import org.apache.axis2.jaxws.util.ClassUtils;
> -import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
> +import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004_Constants;
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
>
> @@ -430,10 +430,10 @@
> AxisOperation op = mc.getAxisOperation();
> String mep = op.getMessageExchangePattern();
>
> - if (mep.equals(WSDL20_2004Constants.MEP_URI_ROBUST_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_URI_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY) ||
> - mep.equals(WSDL20_2004Constants.MEP_CONSTANT_IN_ONLY)) {
> + if (mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_ROBUST_IN_ONLY) ||
> + mep.equals(WSDL20_2004_Constants.MEP_URI_IN_ONLY)) {
> return true;
> }
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
>
>
--
Davanum Srinivas :: http://wso2.org/ :: Oxygen for Web Services Developers
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-dev-help@ws.apache.org