From commits-return-3758-apmail-ode-commits-archive=ode.apache.org@ode.apache.org Tue Feb 17 22:07:42 2009 Return-Path: Delivered-To: apmail-ode-commits-archive@www.apache.org Received: (qmail 39333 invoked from network); 17 Feb 2009 22:07:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Feb 2009 22:07:42 -0000 Received: (qmail 68085 invoked by uid 500); 17 Feb 2009 22:07:42 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 68070 invoked by uid 500); 17 Feb 2009 22:07:42 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 68061 invoked by uid 99); 17 Feb 2009 22:07:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Feb 2009 14:07:42 -0800 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Feb 2009 22:07:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8BBCD2388CF5; Tue, 17 Feb 2009 22:06:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r745271 [11/19] - in /ode/branches/APACHE_ODE_1.X: ./ axis2-war/src/main/webapp/ axis2-war/src/main/webapp/WEB-INF/ axis2-war/src/main/webapp/WEB-INF/classes/ axis2-war/src/main/webapp/WEB-INF/conf.hib-derby/ axis2-war/src/main/webapp/WEB-I... Date: Tue, 17 Feb 2009 22:06:26 -0000 To: commits@ode.apache.org From: midon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090217220637.8BBCD2388CF5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml Tue Feb 17 22:06:18 2009 @@ -17,76 +17,76 @@ !--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - client - service - org.apache.rampart.samples.policy.sample03.PWCBHandler - - - - JKS - TestRampartPolicy/secured-services/client.jks - apache - - - - - JKS - TestRampartPolicy/secured-services/client.jks - apache - - - + + client + service + org.apache.rampart.samples.policy.sample03.PWCBHandler + + + + JKS + TestRampartPolicy/secured-services/client.jks + apache + + + + + JKS + TestRampartPolicy/secured-services/client.jks + apache + + + - - + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml Tue Feb 17 22:06:18 2009 @@ -17,134 +17,134 @@ !--> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client - service - org.apache.rampart.samples.policy.sample04.PWCBHandler - - - - JKS - TestRampartPolicy/secured-services/client.jks - apache - - - - - JKS - TestRampartPolicy/secured-services/client.jks - apache - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client + service + org.apache.rampart.samples.policy.sample04.PWCBHandler + + + + JKS + TestRampartPolicy/secured-services/client.jks + apache + + + + + JKS + TestRampartPolicy/secured-services/client.jks + apache + + + + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/deploy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/deploy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/deploy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestSoapHeader/deploy.xml Tue Feb 17 22:06:18 2009 @@ -17,15 +17,15 @@ ~ under the License. --> + xmlns:pns="http://ode/bpel/unit-test" + xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org"> - - true - - - + + true + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl Tue Feb 17 22:06:18 2009 @@ -58,9 +58,9 @@ - - - + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/deploy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/deploy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/deploy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestStructuredFault/deploy.xml Tue Feb 17 22:06:18 2009 @@ -17,15 +17,15 @@ ~ under the License. --> + xmlns:pns="http://ode/bpel/unit-test" + xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org"> - - true - - - + + true + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/OnEventCorrelationArtifacts.wsdl URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/OnEventCorrelationArtifacts.wsdl?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/OnEventCorrelationArtifacts.wsdl (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/OnEventCorrelationArtifacts.wsdl Tue Feb 17 22:06:18 2009 @@ -1,14 +1,14 @@ + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:tns="http://sample.bpel.org/bpel/sampleArtifacts" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:bpel="http://sample.bpel.org/bpel/sample" + name="OnEventCorrelationArtifacts" + targetNamespace="http://sample.bpel.org/bpel/sampleArtifacts" + xmlns="http://schemas.xmlsoap.org/wsdl/" + > Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/deploy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/deploy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/deploy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/TestThrowOnEvent/deploy.xml Tue Feb 17 22:06:18 2009 @@ -1,13 +1,13 @@ + xmlns:bpel="http://sample.bpel.org/bpel/sample" + > - - - - - - + + + + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.bpel URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.bpel?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.bpel (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.bpel Tue Feb 17 22:06:18 2009 @@ -1,38 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $thisEventStartMessageResponse.body - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $thisEventStartMessageResponse.body + + + + + \ No newline at end of file Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.deploy URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.deploy?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.deploy (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.deploy Tue Feb 17 22:06:18 2009 @@ -1,8 +1,8 @@ - - - BPMN/NewDiagram2 - BPMN/NewDiagram2.svg - - - + + + BPMN/NewDiagram2 + BPMN/NewDiagram2.svg + + + \ No newline at end of file Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.wsdl URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.wsdl?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.wsdl (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2-Pool0.wsdl Tue Feb 17 22:06:18 2009 @@ -1,40 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2.wsdl URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2.wsdl?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2.wsdl (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/BPMN/NewDiagram2.wsdl Tue Feb 17 22:06:18 2009 @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd Tue Feb 17 22:06:18 2009 @@ -1,24 +1,24 @@ - - - - - - Liste de produits - - - - - - - - - - Reference de produit - - - - - - - - + + + + + + Liste de produits + + + + + + + + + + Reference de produit + + + + + + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd Tue Feb 17 22:06:18 2009 @@ -1,70 +1,70 @@ - - - - - - - Liste de matrice de prise en charge - - - - - - - - - - Matrice de prise en charge - - - - - - - - - - Ligne de la matrice - - - - - - - - - - - - Type - Exemples de valeur : Depense, Ticket moderateur, Depassement, Participation forfaitaire, Majoration de TM, PO de base) - - - - - - - - - - - - - - - Montant - - - - - produit couvrant - - - - + + + + + + + Liste de matrice de prise en charge + + + + + + + + + + Matrice de prise en charge + + + + + + + + + + Ligne de la matrice + + + + + + + + + + + + Type + Exemples de valeur : Depense, Ticket moderateur, Depassement, Participation forfaitaire, Majoration de TM, PO de base) + + + + + + + + + + + + + + + Montant + + + + + produit couvrant + + + + Modified: ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/deploy.xml URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/deploy.xml?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/deploy.xml (original) +++ ode/branches/APACHE_ODE_1.X/axis2-war/src/test/resources/XSDReferences/deploy.xml Tue Feb 17 22:06:18 2009 @@ -1,7 +1,7 @@ - - BPMN/NewDiagram2 - BPMN/NewDiagram2.svg - - - + + BPMN/NewDiagram2 + BPMN/NewDiagram2.svg + + + \ No newline at end of file Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java Tue Feb 17 22:06:18 2009 @@ -52,10 +52,10 @@ public EndpointReference activateMyRoleEndpoint(QName processId, Endpoint myRoleEndpoint) { try { ProcessConf pconf = _store.getProcessConfiguration(processId); - Definition wsdl = pconf.getDefinitionForService(myRoleEndpoint.serviceName); - if (wsdl == null) - throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + myRoleEndpoint.serviceName - + " and port " + myRoleEndpoint.portName); + Definition wsdl = pconf.getDefinitionForService(myRoleEndpoint.serviceName); + if (wsdl == null) + throw new ContextException("Unable to access WSDL definition to activate MyRole endpoint for service " + myRoleEndpoint.serviceName + + " and port " + myRoleEndpoint.portName); ODEService svc = _server.createService(pconf, myRoleEndpoint.serviceName, myRoleEndpoint.portName); return svc.getMyServiceRef(); } catch (AxisFault axisFault) { Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Tue Feb 17 22:06:18 2009 @@ -334,7 +334,7 @@ // Since multiple processes may provide services at the same (JMS) endpoint, qualify // the (JMS) endpoint-specific NCName with a process-relative URI, if necessary. QName uniqueServiceName = new QName( - ODEAxisService.extractServiceName(pconf, serviceName, portName)); + ODEAxisService.extractServiceName(pconf, serviceName, portName)); destroyService(uniqueServiceName, portName); Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Tue Feb 17 22:06:18 2009 @@ -262,20 +262,20 @@ * headers) to stuff them into ODE mesage exchange. */ private void readHeader(MessageContext msgContext, MyRoleMessageExchange odeMex) { - String correlationId = (String) msgContext.getProperty(JMSConstants.JMS_COORELATION_ID); - if (correlationId != null) { + String correlationId = (String) msgContext.getProperty(JMSConstants.JMS_COORELATION_ID); + if (correlationId != null) { odeMex.setProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID, correlationId); - } else { + } else { Object otse = msgContext.getProperty("targetSessionEndpoint"); - if (otse != null) { - Element serviceEpr = (Element) otse; - WSAEndpoint endpoint = new WSAEndpoint(); - endpoint.set(serviceEpr); - // Extract the session ID for the local process. - odeMex.setProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID, endpoint.getSessionId()); - } - } - + if (otse != null) { + Element serviceEpr = (Element) otse; + WSAEndpoint endpoint = new WSAEndpoint(); + endpoint.set(serviceEpr); + // Extract the session ID for the local process. + odeMex.setProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID, endpoint.getSessionId()); + } + } + Object ocse = msgContext.getProperty("callbackSessionEndpoint"); if (ocse != null) { Element serviceEpr = (Element) ocse; @@ -304,8 +304,8 @@ // endpoint in this case, except that it is updated with session // information (if available). if (odeMex.getProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID) != null) { - WSAEndpoint sessionAwareEndPoint = new WSAEndpoint(_serviceRef); - sessionAwareEndPoint.setSessionId(odeMex.getProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID)); + WSAEndpoint sessionAwareEndPoint = new WSAEndpoint(_serviceRef); + sessionAwareEndPoint.setSessionId(odeMex.getProperty(MessageExchange.PROPERTY_SEP_MYROLE_SESSIONID)); msgContext.setProperty("callbackSessionEndpoint", sessionAwareEndPoint); } Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/SoapExternalService.java Tue Feb 17 22:06:18 2009 @@ -325,61 +325,61 @@ Document callbackEprXml = odeMex.getMyRoleEndpointReference().toXML(); Element serviceElement = callbackEprXml.getDocumentElement(); - if (myRoleSessionId != null) { - options.setProperty(JMSConstants.JMS_COORELATION_ID, myRoleSessionId); - } else { + if (myRoleSessionId != null) { + options.setProperty(JMSConstants.JMS_COORELATION_ID, myRoleSessionId); + } else { if (myRoleWSAEPR.getSessionId() != null) { options.setProperty(JMSConstants.JMS_COORELATION_ID, myRoleSessionId); } - } + } Element address = DOMUtils.findChildByName(serviceElement, - new QName(Namespaces.WS_ADDRESSING_NS, "Address"), true); + new QName(Namespaces.WS_ADDRESSING_NS, "Address"), true); if (__log.isDebugEnabled()) { __log.debug("The system-defined wsa address is : " + address); } if (address != null) { - String url = address.getTextContent(); - String jmsDestination = (String) options.getProperty(JMSConstants.REPLY_PARAM); + String url = address.getTextContent(); + String jmsDestination = (String) options.getProperty(JMSConstants.REPLY_PARAM); if (__log.isDebugEnabled()) { __log.debug("The user-defined JMS replyTo destination is: " + jmsDestination); __log.debug("The user-defined JMS wait timeout is: " + options.getProperty(JMSConstants.JMS_WAIT_REPLY)); } - if (jmsDestination == null || "".equals(jmsDestination.trim())) { - // If the REPLY_PARAM property is not user-defined, then use the default value from myRole EPR - int startIndex = url.indexOf("jms:/"); - if (startIndex != -1) { - startIndex += "jms:/".length(); - if (url.charAt(startIndex + 1) == '/') { - // startIndex++; // treat "/" as valid start character for queue name - } - if (url.startsWith("dynamic")) { - startIndex += "dynamicQueues".length(); - } - int jmsEndIndex = url.indexOf("?", startIndex); - if (jmsEndIndex == -1) { - jmsEndIndex = url.length(); - } - jmsDestination = url.substring(startIndex, jmsEndIndex); - options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination); - replyEPR = new EndpointReference(url); - } else { - startIndex = url.indexOf("http://"); - if (startIndex != -1) { - startIndex = url.indexOf("/processes/"); - if (startIndex != -1) { - startIndex += "/processes/".length(); - jmsDestination = url.substring(startIndex); - options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination); - } - } - } - } else { - replyEPR = new EndpointReference("jms:/" + jmsDestination); - } + if (jmsDestination == null || "".equals(jmsDestination.trim())) { + // If the REPLY_PARAM property is not user-defined, then use the default value from myRole EPR + int startIndex = url.indexOf("jms:/"); + if (startIndex != -1) { + startIndex += "jms:/".length(); + if (url.charAt(startIndex + 1) == '/') { + // startIndex++; // treat "/" as valid start character for queue name + } + if (url.startsWith("dynamic")) { + startIndex += "dynamicQueues".length(); + } + int jmsEndIndex = url.indexOf("?", startIndex); + if (jmsEndIndex == -1) { + jmsEndIndex = url.length(); + } + jmsDestination = url.substring(startIndex, jmsEndIndex); + options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination); + replyEPR = new EndpointReference(url); + } else { + startIndex = url.indexOf("http://"); + if (startIndex != -1) { + startIndex = url.indexOf("/processes/"); + if (startIndex != -1) { + startIndex += "/processes/".length(); + jmsDestination = url.substring(startIndex); + options.setProperty(JMSConstants.REPLY_PARAM, jmsDestination); + } + } + } + } else { + replyEPR = new EndpointReference("jms:/" + jmsDestination); + } } } else { __log.debug("My-Role EPR not specified, SEP will not be used."); @@ -389,9 +389,9 @@ ctxt.setSoapAction(action); if (replyEPR == null) { - if (MessageExchange.MessageExchangePattern.REQUEST_RESPONSE == odeMex.getMessageExchangePattern()) { - replyEPR = new EndpointReference(Namespaces.WS_ADDRESSING_ANON_URI); - } + if (MessageExchange.MessageExchangePattern.REQUEST_RESPONSE == odeMex.getMessageExchangePattern()) { + replyEPR = new EndpointReference(Namespaces.WS_ADDRESSING_ANON_URI); + } } if (replyEPR != null) { ctxt.setReplyTo(replyEPR); Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java Tue Feb 17 22:06:18 2009 @@ -119,8 +119,8 @@ // Set the JMS destination name on the Axis Service if (isJmsEndpoint(pconf, wsdlServiceName, portName)) { - axisService.addParameter(new Parameter(JMSConstants.DEST_PARAM, - extractJMSDestinationName(axisServiceName, deriveBaseServiceUri(pconf)))); + axisService.addParameter(new Parameter(JMSConstants.DEST_PARAM, + extractJMSDestinationName(axisServiceName, deriveBaseServiceUri(pconf)))); } return axisService; @@ -135,22 +135,22 @@ * @return the corresponding JMS destination name */ private static String extractJMSDestinationName(String serviceName, String baseUri) { - String destinationPrefix = "dynamicQueues/"; + String destinationPrefix = "dynamicQueues/"; int index = serviceName.indexOf(destinationPrefix); if (index == -1) { - destinationPrefix = "dynamicTopics/"; - index = serviceName.indexOf(destinationPrefix); + destinationPrefix = "dynamicTopics/"; + index = serviceName.indexOf(destinationPrefix); } if (index == -1) { - destinationPrefix = baseUri + "/"; - index = serviceName.indexOf(destinationPrefix); + destinationPrefix = baseUri + "/"; + index = serviceName.indexOf(destinationPrefix); return (index != -1) ? serviceName.substring(destinationPrefix.length()) : serviceName; } else { - return serviceName.substring(index); + return serviceName.substring(index); } - } + } - public static AxisService createService(AxisConfiguration axisConfig, QName serviceQName, String port, + public static AxisService createService(AxisConfiguration axisConfig, QName serviceQName, String port, String axisName, Definition wsdlDef, MessageReceiver receiver) throws AxisFault { WSDL11ToAxisServiceBuilder serviceBuilder = new WSDL11ToAxisServiceBuilder(wsdlDef, serviceQName, port); @@ -168,9 +168,9 @@ return axisService; } - private static String extractEndpointUri(ProcessConf pconf, QName wsdlServiceName, String portName) - throws AxisFault { - Definition wsdlDefinition = pconf.getDefinitionForService(wsdlServiceName); + private static String extractEndpointUri(ProcessConf pconf, QName wsdlServiceName, String portName) + throws AxisFault { + Definition wsdlDefinition = pconf.getDefinitionForService(wsdlServiceName); String url = null; Service service = wsdlDefinition.getService(wsdlServiceName); if (service == null) { @@ -188,16 +188,16 @@ if (url == null) { throw new OdeFault("Could not extract any soap:address from service WSDL definition " + wsdlServiceName + " (necessary to establish the process target address)!"); - } + } return url; - } - - private static boolean isJmsEndpoint(ProcessConf pconf, QName wsdlServiceName, String portName) - throws AxisFault { - String url = extractEndpointUri(pconf, wsdlServiceName, portName); - return url.startsWith("jms:"); - } - + } + + private static boolean isJmsEndpoint(ProcessConf pconf, QName wsdlServiceName, String portName) + throws AxisFault { + String url = extractEndpointUri(pconf, wsdlServiceName, portName); + return url.startsWith("jms:"); + } + public static String extractServiceName(ProcessConf pconf, QName wsdlServiceName, String portName) throws AxisFault { String serviceName = parseURLForService(extractEndpointUri(pconf, wsdlServiceName, portName), deriveBaseServiceUri(pconf)); @@ -213,12 +213,12 @@ * which all processes and their services are listed. Returns null if the path does not contain this part. */ protected static String parseURLForService(String path, String baseUri) { - // Assume that path is HTTP-based, by default - String servicePrefix = "/processes/"; - // Don't assume JMS-based paths start the same way - if (path.startsWith("jms:/")) { - servicePrefix = "jms:/"; - } + // Assume that path is HTTP-based, by default + String servicePrefix = "/processes/"; + // Don't assume JMS-based paths start the same way + if (path.startsWith("jms:/")) { + servicePrefix = "jms:/"; + } int index = path.indexOf(servicePrefix); if (-1 != index) { String service; @@ -233,9 +233,9 @@ } // Qualify shared JMS names with unique baseUri if (path.startsWith("jms:/")) { - boolean slashPresent = baseUri.endsWith("/") || service.startsWith("/"); - // service = baseUri + (slashPresent ? "" : "/") + service; // allow successive slashes ("//") in the URI - service = baseUri + "/" + service; + boolean slashPresent = baseUri.endsWith("/") || service.startsWith("/"); + // service = baseUri + (slashPresent ? "" : "/") + service; // allow successive slashes ("//") in the URI + service = baseUri + "/" + service; } return service; } @@ -295,29 +295,29 @@ * When a service name (local part only) is qualified (prefixed) with the above, * it results in a unique identifier that may be used as that service's name. */ - public static String deriveBaseServiceUri(ProcessConf pconf) { - if (pconf != null) { - StringBuffer baseServiceUri = new StringBuffer(); - String bundleName = pconf.getPackage(); - if (bundleName != null) { - baseServiceUri.append(bundleName).append("/"); - if (pconf.getBpelDocument() != null) { - String bpelDocumentName = pconf.getBpelDocument(); - if (bpelDocumentName.indexOf(".") > 0) { - bpelDocumentName = bpelDocumentName.substring(0, bpelDocumentName.indexOf(".")); - } - baseServiceUri.append(bpelDocumentName).append("/"); - String processName = pconf.getType() != null - ? pconf.getType().getLocalPart() : null; - if (processName != null) { - baseServiceUri.append(processName); - return baseServiceUri.toString(); - } - } - } - - } - return null; - } + public static String deriveBaseServiceUri(ProcessConf pconf) { + if (pconf != null) { + StringBuffer baseServiceUri = new StringBuffer(); + String bundleName = pconf.getPackage(); + if (bundleName != null) { + baseServiceUri.append(bundleName).append("/"); + if (pconf.getBpelDocument() != null) { + String bpelDocumentName = pconf.getBpelDocument(); + if (bpelDocumentName.indexOf(".") > 0) { + bpelDocumentName = bpelDocumentName.substring(0, bpelDocumentName.indexOf(".")); + } + baseServiceUri.append(bpelDocumentName).append("/"); + String processName = pconf.getType() != null + ? pconf.getType().getLocalPart() : null; + if (processName != null) { + baseServiceUri.append(processName); + return baseServiceUri.toString(); + } + } + } + + } + return null; + } } Modified: ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java?rev=745271&r1=745270&r2=745271&view=diff ============================================================================== --- ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java (original) +++ ode/branches/APACHE_ODE_1.X/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java Tue Feb 17 22:06:18 2009 @@ -73,9 +73,9 @@ if (otargetSession != null && otargetSession instanceof MutableEndpoint) { - WSAEndpoint targetEpr = EndpointFactory.convertToWSA((MutableEndpoint) otargetSession); - - OMElement to = factory.createSOAPHeaderBlock("To", wsAddrNS); + WSAEndpoint targetEpr = EndpointFactory.convertToWSA((MutableEndpoint) otargetSession); + + OMElement to = factory.createSOAPHeaderBlock("To", wsAddrNS); header.addChild(to); to.setText(targetEpr.getUrl()); @@ -87,9 +87,9 @@ // we only set the ReplyTo and MessageID headers if doing Request-Response org.apache.axis2.addressing.EndpointReference replyToEpr = messageContext.getReplyTo(); if (replyToEpr != null) { - OMElement replyTo = factory.createSOAPHeaderBlock("ReplyTo", wsAddrNS); - OMElement address = factory.createOMElement("Address", wsAddrNS); - replyTo.addChild(address); + OMElement replyTo = factory.createSOAPHeaderBlock("ReplyTo", wsAddrNS); + OMElement address = factory.createOMElement("Address", wsAddrNS); + replyTo.addChild(address); header.addChild(replyTo); address.setText(replyToEpr.getAddress()); @@ -98,13 +98,13 @@ header.addChild(messageIdElem); messageIdElem.setText(messageId); } - + if (targetEpr.getSessionId() != null) { OMElement session = factory.createSOAPHeaderBlock("session", odeSessNS); header.addChild(session); session.setText(targetEpr.getSessionId()); // same for intalio - session = factory.createSOAPHeaderBlock("session", intalioSessNS); + session = factory.createSOAPHeaderBlock("session", intalioSessNS); header.addChild(session); session.setText(targetEpr.getSessionId()); } @@ -122,8 +122,8 @@ intCallback.addChild(address.cloneOMElement()); address.setText(callbackEpr.getUrl()); if (callbackEpr.getSessionId() != null) { - OMElement odeSession = factory.createOMElement("session", odeSessNS); - OMElement intSession = factory.createOMElement("session", intalioSessNS); + OMElement odeSession = factory.createOMElement("session", odeSessNS); + OMElement intSession = factory.createOMElement("session", intalioSessNS); odeSession.setText(callbackEpr.getSessionId()); intSession.setText(callbackEpr.getSessionId()); odeCallback.addChild(odeSession);