svn commit: r1387469 - /axis/axis1/java/trunk/integration/pom.xml
Author: veithen Date: Wed Sep 19 07:16:21 2012 New Revision: 1387469 URL: http://svn.apache.org/viewvc?rev=1387469&view=rev Log: AXIS-2875: Disabled the ComplexEchoServiceTestCase because it fails on Java 1.6 (as described in AXIS-2876). Modified: axis/axis1/java/trunk/integration/pom.xml Modified: axis/axis1/java/trunk/integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1387469&r1=1387468&r2=1387469&view=diff == --- axis/axis1/java/trunk/integration/pom.xml (original) +++ axis/axis1/java/trunk/integration/pom.xml Wed Sep 19 07:16:21 2012 @@ -1272,6 +1272,8 @@ test/wsdl/dataset/** test/functional/TestAutoTypes.java + + test/wsdl/echo/ComplexEchoServiceTestCase.java test/wsdl/date/TestdateSoapBinding* test/wsdl/inout/TestFailed.java
svn commit: r1387517 - in /axis/axis1/java/trunk: distribution/src/main/assembly/ distribution/src/main/files/samples/integrationGuide/example1/ distribution/src/main/files/samples/integrationGuide/ex
Author: veithen Date: Wed Sep 19 10:39:59 2012 New Revision: 1387517 URL: http://svn.apache.org/viewvc?rev=1387517&view=rev Log: Moved the integration guide samples to their own Maven module and added a couple of tests. Added: axis/axis1/java/trunk/samples/integrationguide-sample/ (with props) axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml (with props) axis/axis1/java/trunk/samples/integrationguide-sample/src/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/java/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/java/samples/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/java/samples/integrationGuide/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/java/samples/integrationGuide/example1/ - copied from r1387504, axis/axis1/java/trunk/distribution/src/main/files/samples/integrationGuide/example1/ axis/axis1/java/trunk/samples/integrationguide-sample/src/main/java/samples/integrationGuide/example2/ - copied from r1387504, axis/axis1/java/trunk/distribution/src/main/files/samples/integrationGuide/example2/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java (with props) axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java (with props) axis/axis1/java/trunk/samples/integrationguide-sample/src/test/wsdl/ axis/axis1/java/trunk/samples/integrationguide-sample/src/test/wsdl/hello.wsdl Removed: axis/axis1/java/trunk/distribution/src/main/files/samples/integrationGuide/example1/ axis/axis1/java/trunk/distribution/src/main/files/samples/integrationGuide/example2/ Modified: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml axis/axis1/java/trunk/samples/pom.xml Modified: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml?rev=1387517&r1=1387516&r2=1387517&view=diff == --- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original) +++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Wed Sep 19 10:39:59 2012 @@ -81,6 +81,10 @@ samples/handler + ../samples/integrationguide-sample/src/main/java +/ + + ../samples/jaxm-sample/src/main/java / Propchange: axis/axis1/java/trunk/samples/integrationguide-sample/ -- --- svn:ignore (added) +++ svn:ignore Wed Sep 19 10:39:59 2012 @@ -0,0 +1,4 @@ +.classpath +.project +target +.settings Added: axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml?rev=1387517&view=auto == --- axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml (added) +++ axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml Wed Sep 19 10:39:59 2012 @@ -0,0 +1,84 @@ + + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +4.0.0 + +org.apache.axis +samples +1.4.1-SNAPSHOT +../pom.xml + +integrationguide-sample +Integration Guide Sample + + +${project.groupId} +axis +${project.version} + + +junit +junit +test + + +commons-io +commons-io +1.4 + + + + + +maven-antrun-plugin + + + +process-test-classes + +run + + + + + + +
svn commit: r1387519 - /axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java
Author: veithen Date: Wed Sep 19 10:48:34 2012 New Revision: 1387519 URL: http://svn.apache.org/viewvc?rev=1387519&view=rev Log: Removed unused import. Modified: axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java Modified: axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java?rev=1387519&r1=1387518&r2=1387519&view=diff == --- axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java (original) +++ axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Java2WsdlAntTask.java Wed Sep 19 10:48:34 2012 @@ -15,7 +15,6 @@ */ package org.apache.axis.tools.ant.wsdl; -import org.apache.axis.encoding.TypeMappingImpl; import org.apache.axis.encoding.TypeMappingRegistryImpl; import org.apache.axis.encoding.TypeMappingDelegate; import org.apache.axis.wsdl.fromJava.Emitter;
svn commit: r1387522 - in /axis/axis2/java/core/trunk/modules: kernel/src/org/apache/axis2/builder/ kernel/src/org/apache/axis2/context/externalize/ kernel/src/org/apache/axis2/transport/ kernel/src/o
Author: sagara Date: Wed Sep 19 11:00:38 2012 New Revision: 1387522 URL: http://svn.apache.org/viewvc?rev=1387522&view=rev Log: AXIS2-5374 fixed . * Introduced a new class called MessageProcessorSelector which encapsulate logics and algorithms when selecting MessageBuilders, AttachmentsBuilders and MessageFormatters, eventually related logics scattered in various places need to be moved to here. * REST support is now only depends on disableREST parameter. Added: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/MessageProcessorSelector.java (with props) Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/ApplicationXMLFormatter.java axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/HTTPTransportUtils.java axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient3/HTTPSenderImpl.java axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1387522&r1=1387521&r2=1387522&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Wed Sep 19 11:00:38 2012 @@ -57,6 +57,7 @@ import org.apache.axis2.engine.AxisConfi import org.apache.axis2.java.security.AccessController; import org.apache.axis2.transport.http.HTTPConstants; import org.apache.axis2.util.JavaUtils; +import org.apache.axis2.util.MessageProcessorSelector; import org.apache.axis2.util.MultipleEntryHashMap; import org.apache.axis2.wsdl.WSDLConstants; import org.apache.commons.logging.Log; @@ -454,37 +455,8 @@ public class BuilderUtil { String soapEnvelopeNamespaceURI = getEnvelopeNamespace(contentTypeString); -if (isSOAP) { -if (attachments.getAttachmentSpecType().equals( -MTOMConstants.MTOM_TYPE)) { -//Creates the MTOM specific MTOMStAXSOAPModelBuilder -builder = new MTOMStAXSOAPModelBuilder(streamReader, - attachments, soapEnvelopeNamespaceURI); -msgContext.setDoingMTOM(true); -} else if (attachments.getAttachmentSpecType().equals( -MTOMConstants.SWA_TYPE)) { -builder = new StAXSOAPModelBuilder(streamReader, - soapEnvelopeNamespaceURI); -} else if (attachments.getAttachmentSpecType().equals( -MTOMConstants.SWA_TYPE_12)) { -builder = new StAXSOAPModelBuilder(streamReader, - soapEnvelopeNamespaceURI); -} - -} -// To handle REST XOP case -else { -if (attachments.getAttachmentSpecType().equals(MTOMConstants.MTOM_TYPE)) { -builder = new XOPAwareStAXOMBuilder(streamReader, attachments); - -} else if (attachments.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE)) { -builder = new StAXOMBuilder(streamReader); -} else if (attachments.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE_12)) { -builder = new StAXOMBuilder(streamReader); -} -} +return MessageProcessorSelector.getAttachmentBuilder(msgContext, attachments, streamReader, soapEnvelopeNamespaceURI, isSOAP); -return builder; } protected static Attachments createAttachmentsMap(MessageContext msgContext, Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java?rev=1387522&r1=1387521&r2=1387522&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/MIMEBuilder.java (original) +++ axis/axis2/java/core/trunk/
svn commit: r1387526 - in /axis/axis2/java/transports/trunk/modules: base/src/main/java/org/apache/axis2/transport/base/ jms/src/main/java/org/apache/axis2/transport/jms/ tcp/src/org/apache/axis2/tran
Author: sagara Date: Wed Sep 19 11:04:43 2012 New Revision: 1387526 URL: http://svn.apache.org/viewvc?rev=1387526&view=rev Log: Required code level changes from AXIS2-5374 and a test case fix. Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java axis/axis2/java/transports/trunk/modules/tcp/src/org/apache/axis2/transport/tcp/TCPTransportSender.java axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java Modified: axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java?rev=1387526&r1=1387525&r2=1387526&view=diff == --- axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java (original) +++ axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java Wed Sep 19 11:04:43 2012 @@ -34,6 +34,7 @@ import org.apache.axis2.format.BinaryFor import org.apache.axis2.format.PlainTextFormatter; import org.apache.axis2.transport.MessageFormatter; import org.apache.axis2.transport.TransportUtils; +import org.apache.axis2.util.MessageProcessorSelector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -156,7 +157,7 @@ public class BaseUtils { // ... otherwise, let Axis choose the right message formatter: try { -return TransportUtils.getMessageFormatter(msgContext); +return MessageProcessorSelector.getMessageFormatter(msgContext); } catch (AxisFault axisFault) { throw new BaseTransportException("Unable to get the message formatter to use"); } Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java?rev=1387526&r1=1387525&r2=1387526&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java Wed Sep 19 11:04:43 2012 @@ -19,12 +19,12 @@ import org.apache.axiom.om.OMOutputForma import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMText; import org.apache.axiom.om.OMNode; +import org.apache.axis2.util.MessageProcessorSelector; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.context.MessageContext; import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.TransportOutDescription; -import org.apache.axis2.transport.TransportUtils; import org.apache.axis2.transport.MessageFormatter; import org.apache.axis2.transport.OutTransportInfo; import org.apache.axis2.transport.base.*; @@ -343,7 +343,7 @@ public class JMSSender extends AbstractT OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext); MessageFormatter messageFormatter = null; try { -messageFormatter = TransportUtils.getMessageFormatter(msgContext); +messageFormatter = MessageProcessorSelector.getMessageFormatter(msgContext); } catch (AxisFault axisFault) { throw new JMSException("Unable to get the message formatter to use"); } Modified: axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java?rev=1387526&r1=1387525&r2=1387526&view=diff == --- axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java (original) +++ axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSUtils.java Wed Sep 19 11:04:43 2012 @@ -22,6 +22,7 @@ import org.apache.axis2.builder.Builder; import org.apache.axis2.builder.BuilderUtil; import org.apache.axis2.builder.SOAPBuilder; import org.apache.axis2.context.Me
svn commit: r1387718 - in /axis/axis1/java/trunk: ./ axis-ant/ axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/ axis-ant/src/test/ant/generatorfactory/ axis-ant/src/test/java/org/ axis-ant/src/t
Author: veithen Date: Wed Sep 19 19:34:55 2012 New Revision: 1387718 URL: http://svn.apache.org/viewvc?rev=1387718&view=rev Log: AXIS-2877: * Ensure that Wsdl2javaAntTask sets up the class loader before attempting to set the custom GeneratorFactory. * Change the class loader delegation mode to parent-first so that the custom GeneratorFactory can be loaded even if the nested contains the Axis JARs. Added: axis/axis1/java/trunk/axis-ant/src/test/ant/generatorfactory/ axis/axis1/java/trunk/axis-ant/src/test/ant/generatorfactory/build.xml (with props) axis/axis1/java/trunk/axis-ant/src/test/java/org/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/ axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java (with props) axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/MyGeneratorFactory.java (with props) axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/MyServiceImplWriter.java (with props) axis/axis1/java/trunk/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/MyServiceWriter.java (with props) axis/axis1/java/trunk/axis-ant/src/test/wsdl/generatorfactory/ axis/axis1/java/trunk/axis-ant/src/test/wsdl/generatorfactory/sample.wsdl Modified: axis/axis1/java/trunk/axis-ant/pom.xml axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java axis/axis1/java/trunk/pom.xml axis/axis1/java/trunk/samples/integrationguide-sample/pom.xml Modified: axis/axis1/java/trunk/axis-ant/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/pom.xml?rev=1387718&r1=1387717&r2=1387718&view=diff == --- axis/axis1/java/trunk/axis-ant/pom.xml (original) +++ axis/axis1/java/trunk/axis-ant/pom.xml Wed Sep 19 19:34:55 2012 @@ -55,6 +55,11 @@ xmlunit test + +commons-io +commons-io +test + @@ -75,6 +80,7 @@ + Modified: axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java?rev=1387718&r1=1387717&r2=1387718&view=diff == --- axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java (original) +++ axis/axis1/java/trunk/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java Wed Sep 19 19:34:55 2012 @@ -210,6 +210,17 @@ public class Wsdl2javaAntTask extends Ta // Instantiate the emitter Emitter emitter = createEmitter(); +if (classpath != null) { +AntClassLoader cl = new AntClassLoader( +getClass().getClassLoader(), +getProject(), +classpath, +true); +log("Using CLASSPATH " + cl.getClasspath(), +Project.MSG_VERBOSE); +ClassUtils.setDefaultClassLoader(cl); +} + //extract the scope Scope scope = Scope.getScope(deployScope, null); if (scope != null) { @@ -253,17 +264,6 @@ public class Wsdl2javaAntTask extends Ta emitter.setImplementationClassName(implementationClassName); Authenticator.setDefault(new DefaultAuthenticator(username, password)); -if (classpath != null) { -AntClassLoader cl = new AntClassLoader( -getClass().getClassLoader(), -getProject(), -classpath, -false); -log("Using CLASSPATH " + cl.getClasspath(), -Project.MSG_VERBOSE); -ClassUtils.setDefaultClassLoader(cl); -} - try { if(url.indexOf(':') == -1) url = getProject().resolveFile(url).getAbsolutePath(); Added: axis/axis1/java/trunk/axis-ant/src/test/ant/generatorfactory/build.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/src/test/ant/generatorfactory/build.xml?