Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 27354 invoked from network); 5 Feb 2007 08:21:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Feb 2007 08:21:48 -0000 Received: (qmail 76602 invoked by uid 500); 5 Feb 2007 08:21:55 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 76372 invoked by uid 500); 5 Feb 2007 08:21:54 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 76361 invoked by uid 500); 5 Feb 2007 08:21:54 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 76358 invoked by uid 99); 5 Feb 2007 08:21:54 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 00:21:54 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 00:21:46 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 6B8111A981A; Mon, 5 Feb 2007 00:21:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r503585 [1/9] - in /webservices/axis2/trunk/java: etc/ modules/adb-codegen/ modules/adb-codegen/src/org/apache/axis2/schema/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb/ modules/addressing/ modules/addressing/src/o... Date: Mon, 05 Feb 2007 08:21:19 -0000 To: axis2-cvs@ws.apache.org From: keithc@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070205082126.6B8111A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: keithc Date: Mon Feb 5 00:21:12 2007 New Revision: 503585 URL: http://svn.apache.org/viewvc?view=rev&rev=503585 Log: Merging https://svn.apache.org/repos/asf/webservices/axis2/branches/java/WSDL_2_0 to trunk as discussed in http://www.mail-archive.com/axis-dev@ws.apache.org/msg26438.html. Added: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisBinding.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/description/WSDL20DefaultValueHolder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java - copied, changed from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/engine/HTTPLocationBasedDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/transport/http/util/ComplexPart.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/util/MultipleEntryHashMap.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/HTTPHeaderMessage.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/HTTPHeaderMessage.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SOAPModuleMessage.java - copied unchanged from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/src/org/apache/axis2/wsdl/SOAPModuleMessage.java webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/ - copied from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/test/org/apache/axis2/transport/http/ webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/RestSenderTest.java - copied, changed from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/test/org/apache/axis2/transport/http/RestSenderTest.java webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/SchemaUtilTest.java - copied, changed from r501333, webservices/axis2/branches/java/WSDL_2_0/modules/kernel/test/org/apache/axis2/util/SchemaUtilTest.java Modified: webservices/axis2/trunk/java/etc/project.properties webservices/axis2/trunk/java/etc/project.xml webservices/axis2/trunk/java/modules/adb-codegen/project.xml webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl webservices/axis2/trunk/java/modules/adb/project.xml webservices/axis2/trunk/java/modules/addressing/project.xml webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java webservices/axis2/trunk/java/modules/codegen/project.xml webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/CEmitter.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/databinding/TypeMappingAdapter.java webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/MessageReceiverTemplate.xsl webservices/axis2/trunk/java/modules/integration/project.xml webservices/axis2/trunk/java/modules/integration/test-resources/security/complete.service.axis2.xml webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/WSDLClientTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/AddressingMTOMSecurityTest.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java webservices/axis2/trunk/java/modules/integration/test/samples/wsdl/perf/PerfPortTypeTest.java webservices/axis2/trunk/java/modules/java2wsdl/project.xml webservices/axis2/trunk/java/modules/jibx/project.xml webservices/axis2/trunk/java/modules/jibx/test-resources/repo/conf/axis2.xml webservices/axis2/trunk/java/modules/jibx/test/org/apache/axis2/jibx/Test.java webservices/axis2/trunk/java/modules/kernel/conf/axis2.xml webservices/axis2/trunk/java/modules/kernel/project.xml webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/AxisFault.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Stub.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContextFactory.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DeploymentEngine.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/DescriptionBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisOperationFactory.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2OM.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/InOnlyAxisOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutInAxisOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/OutOnlyAxisOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/RobustOutOnlyAxisOperation.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAllAxisServicesBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL20ToAxisServiceBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/WSDL2Constants.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/dispatchers/SOAPMessageBodyBasedOperationDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AbstractDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AddressingBasedDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisEngine.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/DispatchPhase.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIBasedDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/RequestURIOperationDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPActionBasedDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/SOAPMessageBodyBasedDispatcher.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/namespace/Constants.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AbstractHTTPSender.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/CommonsHTTPTransportSender.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/RESTSender.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/SOAPOverHTTPSender.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/ServletBasedOutTransportInfo.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/RESTUtil.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/MessageContextBuilder.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/SchemaUtil.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/Utils.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/SOAPHeaderMessage.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLConstants.java webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/wsdl/WSDLUtil.java webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/engine/EnginePausingTest.java webservices/axis2/trunk/java/modules/mtompolicy/project.xml webservices/axis2/trunk/java/modules/rahas/project.xml webservices/axis2/trunk/java/modules/rahas/src/META-INF/module.xml webservices/axis2/trunk/java/modules/secpolicy/project.xml webservices/axis2/trunk/java/modules/security/project.xml webservices/axis2/trunk/java/modules/xmlbeans/project.xml Modified: webservices/axis2/trunk/java/etc/project.properties URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.properties?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/etc/project.properties (original) +++ webservices/axis2/trunk/java/etc/project.properties Mon Feb 5 00:21:12 2007 @@ -218,3 +218,5 @@ maven.html2xdoc.dir=./xdocs maven.pdf.navigationFile=navigation-pdf.xml maven.allreports.disable=true + + Modified: webservices/axis2/trunk/java/etc/project.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/etc/project.xml?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/etc/project.xml (original) +++ webservices/axis2/trunk/java/etc/project.xml Mon Feb 5 00:21:12 2007 @@ -120,7 +120,7 @@ plugin ${maven.plugin.plugin.version} - + Modified: webservices/axis2/trunk/java/modules/adb-codegen/project.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/project.xml?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/adb-codegen/project.xml (original) +++ webservices/axis2/trunk/java/modules/adb-codegen/project.xml Mon Feb 5 00:21:12 2007 @@ -146,7 +146,6 @@ - axis-dev@ws.apache.org Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original) +++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Mon Feb 5 00:21:12 2007 @@ -940,7 +940,6 @@ * * @param complexType * @param metaInfHolder - * @param fullyQualifiedClassName the name returned by makeFullyQualifiedClassName() or null if it wasn't called * @throws SchemaCompilationException */ private String writeComplexType(XmlSchemaComplexType complexType, BeanWriterMetaInfoHolder metaInfHolder) Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl (original) +++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBDatabindingTemplate.xsl Mon Feb 5 00:21:12 2007 @@ -21,6 +21,9 @@ .MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); + + return param; + return param.getOMElement(.MY_QNAME, org.apache.axiom.om.OMAbstractFactory.getOMFactory()); @@ -105,6 +108,9 @@ param, .MY_QNAME,factory)); + + emptyEnvelope.getBody().addChild(param); + emptyEnvelope.getBody().addChild(param.getOMElement(.MY_QNAME,factory)); @@ -276,6 +282,9 @@ return Helper.parse(param.getXMLStreamReaderWithoutCaching()); + + + return param; return .Factory.parse(param.getXMLStreamReaderWithoutCaching()); Modified: webservices/axis2/trunk/java/modules/adb/project.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/project.xml?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/adb/project.xml (original) +++ webservices/axis2/trunk/java/modules/adb/project.xml Mon Feb 5 00:21:12 2007 @@ -122,7 +122,6 @@ - Modified: webservices/axis2/trunk/java/modules/addressing/project.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/project.xml?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/addressing/project.xml (original) +++ webservices/axis2/trunk/java/modules/addressing/project.xml Mon Feb 5 00:21:12 2007 @@ -140,5 +140,4 @@ - Modified: webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java (original) +++ webservices/axis2/trunk/java/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingValidationHandler.java Mon Feb 5 00:21:12 2007 @@ -144,9 +144,9 @@ String mep = axisOperation.getMessageExchangePattern(); int mepConstant = Utils.getAxisSpecifMEPConstant(mep); - if (mepConstant == WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OUT || - mepConstant == WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_IN_OPTIONAL_OUT || - mepConstant == WSDLConstants.WSDL20_2004Constants.MEP_CONSTANT_ROBUST_IN_ONLY) + if (mepConstant == WSDLConstants.MEP_CONSTANT_IN_OUT || + mepConstant == WSDLConstants.MEP_CONSTANT_IN_OPTIONAL_OUT || + mepConstant == WSDLConstants.MEP_CONSTANT_ROBUST_IN_ONLY) { String messageId = msgContext.getOptions().getMessageId(); if (messageId == null || "".equals(messageId)) { Modified: webservices/axis2/trunk/java/modules/codegen/project.xml URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/project.xml?view=diff&rev=503585&r1=503584&r2=503585 ============================================================================== --- webservices/axis2/trunk/java/modules/codegen/project.xml (original) +++ webservices/axis2/trunk/java/modules/codegen/project.xml Mon Feb 5 00:21:12 2007 @@ -213,7 +213,6 @@ - --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org