You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2009/02/17 23:06:26 UTC
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...
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 @@
!-->
<wsp:Policy wsu:Id="SigEncr" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:RecipientToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:TripleDesRsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:AsymmetricBinding>
- <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- </wsp:Policy>
- </sp:Wss10>
- <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <sp:Body/>
- </sp:EncryptedParts>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:RecipientToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:TripleDesRsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:AsymmetricBinding>
+ <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ </wsp:Policy>
+ </sp:Wss10>
+ <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
- <ramp:user>client</ramp:user>
- <ramp:encryptionUser>service</ramp:encryptionUser>
- <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample03.PWCBHandler</ramp:passwordCallbackClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
- <ramp:encryptionCypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
- </ramp:crypto>
- </ramp:encryptionCypto>
- </ramp:RampartConfig>
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:user>client</ramp:user>
+ <ramp:encryptionUser>service</ramp:encryptionUser>
+ <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample03.PWCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ <ramp:encryptionCypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+ </ramp:RampartConfig>
- </wsp:All>
- </wsp:ExactlyOne>
+ </wsp:All>
+ </wsp:ExactlyOne>
</wsp:Policy>
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 @@
!-->
<wsp:Policy wsu:Id="SecConvPolicy2" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
- <wsp:ExactlyOne>
- <wsp:All>
- <sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:SecureConversationToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
- <wsp:Policy>
- <sp:RequireDerivedKeys/>
- <sp:BootstrapPolicy>
- <wsp:Policy>
- <sp:EncryptedParts>
- <sp:Body/>
- </sp:EncryptedParts>
- <sp:SymmetricBinding>
- <wsp:Policy>
- <sp:ProtectionToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
- <wsp:Policy>
- <sp:RequireDerivedKeys/>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128Rsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:EncryptSignature/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:EndorsingSupportingTokens>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
- <wsp:Policy>
- <sp:RequireThumbprintReference/>
- <sp:WssX509V3Token10/>
- </wsp:Policy>
- </sp:X509Token>
- </wsp:Policy>
- </sp:EndorsingSupportingTokens>
- <sp:Wss11>
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- <sp:RequireSignatureConfirmation/>
- </wsp:Policy>
- </sp:Wss11>
- <sp:Trust10>
- <wsp:Policy>
- <sp:MustSupportIssuedTokens/>
- <sp:RequireClientEntropy/>
- <sp:RequireServerEntropy/>
- </wsp:Policy>
- </sp:Trust10>
- </wsp:Policy>
- </sp:BootstrapPolicy>
- </wsp:Policy>
- </sp:SecureConversationToken>
- </wsp:Policy>
- </sp:ProtectionToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic128Rsa15/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- <sp:EncryptSignature/>
- <sp:OnlySignEntireHeadersAndBody/>
- </wsp:Policy>
- </sp:SymmetricBinding>
- <sp:Wss11 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:MustSupportRefKeyIdentifier/>
- <sp:MustSupportRefIssuerSerial/>
- <sp:MustSupportRefThumbprint/>
- <sp:MustSupportRefEncryptedKey/>
- </wsp:Policy>
- </sp:Wss11>
- <sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:MustSupportIssuedTokens/>
- <sp:RequireClientEntropy/>
- <sp:RequireServerEntropy/>
- </wsp:Policy>
- </sp:Trust10>
- <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <sp:Body/>
- </sp:EncryptedParts>
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
- <ramp:user>client</ramp:user>
- <ramp:encryptionUser>service</ramp:encryptionUser>
- <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample04.PWCBHandler</ramp:passwordCallbackClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
- <ramp:encryptionCypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
- <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
- </ramp:crypto>
- </ramp:encryptionCypto>
-
- </ramp:RampartConfig>
- </wsp:All>
- </wsp:ExactlyOne>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:SymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:SecureConversationToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:BootstrapPolicy>
+ <wsp:Policy>
+ <sp:EncryptedParts>
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <sp:SymmetricBinding>
+ <wsp:Policy>
+ <sp:ProtectionToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+ <wsp:Policy>
+ <sp:RequireDerivedKeys/>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128Rsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:EncryptSignature/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:EndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy>
+ <sp:RequireThumbprintReference/>
+ <sp:WssX509V3Token10/>
+ </wsp:Policy>
+ </sp:X509Token>
+ </wsp:Policy>
+ </sp:EndorsingSupportingTokens>
+ <sp:Wss11>
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ <sp:RequireSignatureConfirmation/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10>
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ </wsp:Policy>
+ </sp:BootstrapPolicy>
+ </wsp:Policy>
+ </sp:SecureConversationToken>
+ </wsp:Policy>
+ </sp:ProtectionToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic128Rsa15/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ <sp:EncryptSignature/>
+ <sp:OnlySignEntireHeadersAndBody/>
+ </wsp:Policy>
+ </sp:SymmetricBinding>
+ <sp:Wss11 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportRefKeyIdentifier/>
+ <sp:MustSupportRefIssuerSerial/>
+ <sp:MustSupportRefThumbprint/>
+ <sp:MustSupportRefEncryptedKey/>
+ </wsp:Policy>
+ </sp:Wss11>
+ <sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:MustSupportIssuedTokens/>
+ <sp:RequireClientEntropy/>
+ <sp:RequireServerEntropy/>
+ </wsp:Policy>
+ </sp:Trust10>
+ <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <sp:Body/>
+ </sp:EncryptedParts>
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:user>client</ramp:user>
+ <ramp:encryptionUser>service</ramp:encryptionUser>
+ <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample04.PWCBHandler</ramp:passwordCallbackClass>
+
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ <ramp:encryptionCypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-services/client.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+
+ </ramp:RampartConfig>
+ </wsp:All>
+ </wsp:ExactlyOne>
</wsp:Policy>
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.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org">
+ xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org">
- <process name="pns:HeaderTest">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HeaderTestService" port="HeaderTestPort"/>
- </provide>
+ <process name="pns:HeaderTest">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HeaderTestService" port="HeaderTestPort"/>
+ </provide>
<invoke partnerLink="dummyPartnerLink">
<service name="dns:DummyService" port="DummyServiceSOAP11port_http"/>
</invoke>
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 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
- <soap:address location="http://localhost:8888/ode/processes/helloWorld"/>
- </wsdl:port>
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8888/ode/processes/helloWorld"/>
+ </wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
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.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org">
+ xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl" xmlns:dns="http://axis2.ode.apache.org">
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
- </provide>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HelloService" port="HelloPort"/>
+ </provide>
<invoke partnerLink="dummyPartnerLink">
<service name="dns:DummyService" port="DummyServiceSOAP11port_http"/>
</invoke>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions
- 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/"
- >
+ 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/"
+ >
<vprop:property name="input" type="xs:string"/>
<vprop:propertyAlias messageType="bpel:OnEventCorrelationRequestMessage" part="payload" propertyName="tns:input">
<vprop:query><![CDATA[bpel:input]]></vprop:query>
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 @@
<?xml version='1.0' encoding='UTF-8'?>
<dd:deploy xmlns:dd="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:bpel="http://sample.bpel.org/bpel/sample"
- >
+ xmlns:bpel="http://sample.bpel.org/bpel/sample"
+ >
- <dd:process
- name="bpel:OnEventCorrelation" fileName="OnEventCorrelation.bpel">
- <!--dd:process-events generate="none"/-->
- <dd:provide partnerLink="client">
- <dd:service name="bpel:OnEventCorrelation" port="OnEventCorrelation" />
- </dd:provide>
- </dd:process>
+ <dd:process
+ name="bpel:OnEventCorrelation" fileName="OnEventCorrelation.bpel">
+ <!--dd:process-events generate="none"/-->
+ <dd:provide partnerLink="client">
+ <dd:service name="bpel:OnEventCorrelation" port="OnEventCorrelation" />
+ </dd:provide>
+ </dd:process>
</dd:deploy>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpel:process xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" xmlns:bpmn="http://www.intalio.com/bpms" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" bpmn:label="Pool0" bpmn:id="_9TjBEHjqEdyMF-4bCGAcTQ" name="Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
- <bpel:import namespace="http://example.com/BPMN/NewDiagram2" location="NewDiagram2.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <bpel:import namespace="http://example.com/BPMN/NewDiagram2/Pool0" location="NewDiagram2-Pool0.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <bpel:partnerLinks>
- <bpel:partnerLink name="pool0AndPooldoPlkVar" partnerLinkType="diag:Pool0AndPooldo" myRole="Pool0_for_Pooldo"/>
- </bpel:partnerLinks>
- <bpel:variables>
- <bpel:variable name="thisEventStartMessageRequest" messageType="this:EventStartMessageRequest"/>
- <bpel:variable name="thisEventStartMessageResponse" messageType="this:EventStartMessageResponse"/>
- </bpel:variables>
- <bpel:sequence>
- <bpel:receive partnerLink="pool0AndPooldoPlkVar" portType="this:ForPooldo" operation="EventStartMessage" variable="thisEventStartMessageRequest" createInstance="yes" bpmn:label="EventStartMessage" bpmn:id="_9mUzIHjqEdyMF-4bCGAcTQ"></bpel:receive>
- <bpel:assign name="init-variables-Pool0">
- <bpel:copy bpmn:label="$thisEventStartMessageResponse out:_BpmbUHjrEdyMF-4bCGAcTQ">
- <bpel:from>
- <bpel:literal>
-<xreftst:Listexreftst>
- <xreftst:xreftst>
- <xreftst:LigneMatrice>
- <xreftst:Type>
- </xreftst:Type>
- <xreftst:Montant>
- </xreftst:Montant>
- <xreftst:ProduitCouvrant>
- </xreftst:ProduitCouvrant>
- </xreftst:LigneMatrice>
- </xreftst:xreftst>
-</xreftst:Listexreftst>
- </bpel:literal>
- </bpel:from>
- <bpel:to>$thisEventStartMessageResponse.body</bpel:to>
- </bpel:copy>
- </bpel:assign>
- <bpel:empty bpmn:label="task" bpmn:id="_-IlysHjqEdyMF-4bCGAcTQ"/>
- <bpel:reply partnerLink="pool0AndPooldoPlkVar" portType="this:ForPooldo" operation="EventStartMessage" variable="thisEventStartMessageResponse" bpmn:label="EventEndMessage" bpmn:id="__fUVEHjqEdyMF-4bCGAcTQ"></bpel:reply>
- </bpel:sequence>
+<?xml version="1.0" encoding="UTF-8"?>
+<bpel:process xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" xmlns:bpmn="http://www.intalio.com/bpms" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" bpmn:label="Pool0" bpmn:id="_9TjBEHjqEdyMF-4bCGAcTQ" name="Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
+ <bpel:import namespace="http://example.com/BPMN/NewDiagram2" location="NewDiagram2.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <bpel:import namespace="http://example.com/BPMN/NewDiagram2/Pool0" location="NewDiagram2-Pool0.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <bpel:partnerLinks>
+ <bpel:partnerLink name="pool0AndPooldoPlkVar" partnerLinkType="diag:Pool0AndPooldo" myRole="Pool0_for_Pooldo"/>
+ </bpel:partnerLinks>
+ <bpel:variables>
+ <bpel:variable name="thisEventStartMessageRequest" messageType="this:EventStartMessageRequest"/>
+ <bpel:variable name="thisEventStartMessageResponse" messageType="this:EventStartMessageResponse"/>
+ </bpel:variables>
+ <bpel:sequence>
+ <bpel:receive partnerLink="pool0AndPooldoPlkVar" portType="this:ForPooldo" operation="EventStartMessage" variable="thisEventStartMessageRequest" createInstance="yes" bpmn:label="EventStartMessage" bpmn:id="_9mUzIHjqEdyMF-4bCGAcTQ"></bpel:receive>
+ <bpel:assign name="init-variables-Pool0">
+ <bpel:copy bpmn:label="$thisEventStartMessageResponse out:_BpmbUHjrEdyMF-4bCGAcTQ">
+ <bpel:from>
+ <bpel:literal>
+<xreftst:Listexreftst>
+ <xreftst:xreftst>
+ <xreftst:LigneMatrice>
+ <xreftst:Type>
+ </xreftst:Type>
+ <xreftst:Montant>
+ </xreftst:Montant>
+ <xreftst:ProduitCouvrant>
+ </xreftst:ProduitCouvrant>
+ </xreftst:LigneMatrice>
+ </xreftst:xreftst>
+</xreftst:Listexreftst>
+ </bpel:literal>
+ </bpel:from>
+ <bpel:to>$thisEventStartMessageResponse.body</bpel:to>
+ </bpel:copy>
+ </bpel:assign>
+ <bpel:empty bpmn:label="task" bpmn:id="_-IlysHjqEdyMF-4bCGAcTQ"/>
+ <bpel:reply partnerLink="pool0AndPooldoPlkVar" portType="this:ForPooldo" operation="EventStartMessage" variable="thisEventStartMessageResponse" bpmn:label="EventEndMessage" bpmn:id="__fUVEHjqEdyMF-4bCGAcTQ"></bpel:reply>
+ </bpel:sequence>
</bpel:process>
\ 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 @@
-<?xml version='1.0' encoding='utf-8'?>
-<dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:MatricePriseEnCharge="http://www.agora.msa.fr/TarifMaladie" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" name="this:Pool0" fileName="BPMN/NewDiagram2-Pool0.bpel">
- <dd:property name="PATH">BPMN/NewDiagram2</dd:property>
- <dd:property name="SVG">BPMN/NewDiagram2.svg</dd:property>
- <dd:provide partnerLink="pool0AndPooldoPlkVar">
- <dd:service name="this:CanonicServiceForPooldo" port="canonicPort"/>
- </dd:provide>
+<?xml version='1.0' encoding='utf-8'?>
+<dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:MatricePriseEnCharge="http://www.agora.msa.fr/TarifMaladie" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" name="this:Pool0" fileName="BPMN/NewDiagram2-Pool0.bpel">
+ <dd:property name="PATH">BPMN/NewDiagram2</dd:property>
+ <dd:property name="SVG">BPMN/NewDiagram2.svg</dd:property>
+ <dd:provide partnerLink="pool0AndPooldoPlkVar">
+ <dd:service name="this:CanonicServiceForPooldo" port="canonicPort"/>
+ </dd:provide>
</dd:process>
\ 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 @@
-<?xml version='1.0' encoding='utf-8'?>
-<wsdl:definitions xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
- <wsdl:types>
- <xs:schema targetNamespace="http://ode.apache.org/test/xsdref-test">
- <xs:include schemaLocation="../XSDSchema/xreftst.xsd"/>
- </xs:schema>
- <xs:schema elementFormDefault="qualified" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
- <xs:element name="EventStartMessageRequest" type="xs:string"/>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="EventStartMessageRequest">
- <wsdl:part name="body" element="this:EventStartMessageRequest"/>
- </wsdl:message>
- <wsdl:message name="EventStartMessageResponse">
- <wsdl:part name="body" element="xreftst:Listexreftst"/>
- </wsdl:message>
- <wsdl:portType name="ForPooldo">
- <wsdl:operation name="EventStartMessage">
- <wsdl:input message="this:EventStartMessageRequest" name="EventStartMessage"/>
- <wsdl:output message="this:EventStartMessageResponse" name="EventStartMessageResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CanonicBindingForPooldo" type="this:ForPooldo">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="EventStartMessage">
- <soap:operation style="document" soapAction="http://example.com/BPMN/NewDiagram2/Pool0/ForPooldo/EventStartMessage"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CanonicServiceForPooldo">
- <wsdl:port name="canonicPort" binding="this:CanonicBindingForPooldo">
- <soap:address location="http://localhost:8888/ode/processes/testXSDko/BPMN/NewDiagram2/Pool0/Pooldo"/>
- </wsdl:port>
- </wsdl:service>
+<?xml version='1.0' encoding='utf-8'?>
+<wsdl:definitions xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
+ <wsdl:types>
+ <xs:schema targetNamespace="http://ode.apache.org/test/xsdref-test">
+ <xs:include schemaLocation="../XSDSchema/xreftst.xsd"/>
+ </xs:schema>
+ <xs:schema elementFormDefault="qualified" targetNamespace="http://example.com/BPMN/NewDiagram2/Pool0">
+ <xs:element name="EventStartMessageRequest" type="xs:string"/>
+ </xs:schema>
+ </wsdl:types>
+ <wsdl:message name="EventStartMessageRequest">
+ <wsdl:part name="body" element="this:EventStartMessageRequest"/>
+ </wsdl:message>
+ <wsdl:message name="EventStartMessageResponse">
+ <wsdl:part name="body" element="xreftst:Listexreftst"/>
+ </wsdl:message>
+ <wsdl:portType name="ForPooldo">
+ <wsdl:operation name="EventStartMessage">
+ <wsdl:input message="this:EventStartMessageRequest" name="EventStartMessage"/>
+ <wsdl:output message="this:EventStartMessageResponse" name="EventStartMessageResponse"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="CanonicBindingForPooldo" type="this:ForPooldo">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="EventStartMessage">
+ <soap:operation style="document" soapAction="http://example.com/BPMN/NewDiagram2/Pool0/ForPooldo/EventStartMessage"/>
+ <wsdl:input>
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="CanonicServiceForPooldo">
+ <wsdl:port name="canonicPort" binding="this:CanonicBindingForPooldo">
+ <soap:address location="http://localhost:8888/ode/processes/testXSDko/BPMN/NewDiagram2/Pool0/Pooldo"/>
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
\ 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 @@
-<?xml version='1.0' encoding='utf-8'?>
-<wsdl:definitions xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:PGMD_CURMED="http://www.agora.msa.fr/CURMED" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ResultatControleFacturation="http://ode.apache.org/test/xsdref-test" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:Pool0="http://example.com/BPMN/NewDiagram2/Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2">
- <wsdl:import namespace="http://example.com/BPMN/NewDiagram2/Pool0" location="NewDiagram2-Pool0.wsdl"/>
- <pnlk:partnerLinkType name="Pool0AndPooldo">
- <pnlk:role name="Pool0_for_Pooldo" portType="Pool0:ForPooldo"/>
- </pnlk:partnerLinkType>
+<?xml version='1.0' encoding='utf-8'?>
+<wsdl:definitions xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:PGMD_CURMED="http://www.agora.msa.fr/CURMED" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:ResultatControleFacturation="http://ode.apache.org/test/xsdref-test" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:Pool0="http://example.com/BPMN/NewDiagram2/Pool0" targetNamespace="http://example.com/BPMN/NewDiagram2">
+ <wsdl:import namespace="http://example.com/BPMN/NewDiagram2/Pool0" location="NewDiagram2-Pool0.wsdl"/>
+ <pnlk:partnerLinkType name="Pool0AndPooldo">
+ <pnlk:role name="Pool0_for_Pooldo" portType="Pool0:ForPooldo"/>
+ </pnlk:partnerLinkType>
</wsdl:definitions>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by none (none) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ode.apache.org/test/xsdref-test" targetNamespace="http://ode.apache.org/test/xsdref-test" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:element name="ListeProduits" type="ListeProduitsType">
- <xs:annotation>
- <xs:documentation>Liste de produits</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="ListeProduitsType">
- <xs:sequence>
- <xs:element ref="ReferenceProduit" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="ReferenceProduit" type="ReferenceProduitType">
- <xs:annotation>
- <xs:documentation>Reference de produit</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:simpleType name="ReferenceProduitType">
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by none (none) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ode.apache.org/test/xsdref-test" targetNamespace="http://ode.apache.org/test/xsdref-test" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:element name="ListeProduits" type="ListeProduitsType">
+ <xs:annotation>
+ <xs:documentation>Liste de produits</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="ListeProduitsType">
+ <xs:sequence>
+ <xs:element ref="ReferenceProduit" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="ReferenceProduit" type="ReferenceProduitType">
+ <xs:annotation>
+ <xs:documentation>Reference de produit</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:simpleType name="ReferenceProduitType">
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+</xs:schema>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by none (none) -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ode.apache.org/test/xsdref-test" targetNamespace="http://ode.apache.org/test/xsdref-test" elementFormDefault="qualified" attributeFormDefault="unqualified">
- <xs:include schemaLocation="ListeProduit.xsd"/>
- <xs:element name="Listexreftst" type="ListexreftstType">
- <xs:annotation>
- <xs:documentation>Liste de matrice de prise en charge</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="ListexreftstType">
- <xs:sequence>
- <xs:element ref="xreftst" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="xreftst" type="xreftstType">
- <xs:annotation>
- <xs:documentation>Matrice de prise en charge</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="xreftstType">
- <xs:sequence>
- <xs:element ref="LigneMatrice" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="LigneMatrice" type="LigneMatriceType">
- <xs:annotation>
- <xs:documentation>Ligne de la matrice</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:complexType name="LigneMatriceType">
- <xs:sequence>
- <xs:element ref="Type"/>
- <xs:element ref="Montant"/>
- <xs:element ref="ProduitCouvrant"/>
- </xs:sequence>
- </xs:complexType>
- <xs:element name="Type">
- <xs:annotation>
- <xs:documentation>Type
- Exemples de valeur : Depense, Ticket moderateur, Depassement, Participation forfaitaire, Majoration de TM, PO de base)</xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="Depense"/>
- <xs:enumeration value="Ticket moderateur"/>
- <xs:enumeration value="Depassement"/>
- <xs:enumeration value="Participation forfaitaire"/>
- <xs:enumeration value="Majoration de TM"/>
- <xs:enumeration value="PO de base"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="Montant" type="xs:decimal">
- <xs:annotation>
- <xs:documentation>Montant</xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="ProduitCouvrant" type="ReferenceProduitType">
- <xs:annotation>
- <xs:documentation>produit couvrant</xs:documentation>
- </xs:annotation>
- </xs:element>
- <!--
- <xs:simpleType name="ReferenceProduitType2">
- <xs:restriction base="xs:string">
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- -->
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by none (none) -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://ode.apache.org/test/xsdref-test" targetNamespace="http://ode.apache.org/test/xsdref-test" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <xs:include schemaLocation="ListeProduit.xsd"/>
+ <xs:element name="Listexreftst" type="ListexreftstType">
+ <xs:annotation>
+ <xs:documentation>Liste de matrice de prise en charge</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="ListexreftstType">
+ <xs:sequence>
+ <xs:element ref="xreftst" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="xreftst" type="xreftstType">
+ <xs:annotation>
+ <xs:documentation>Matrice de prise en charge</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="xreftstType">
+ <xs:sequence>
+ <xs:element ref="LigneMatrice" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="LigneMatrice" type="LigneMatriceType">
+ <xs:annotation>
+ <xs:documentation>Ligne de la matrice</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:complexType name="LigneMatriceType">
+ <xs:sequence>
+ <xs:element ref="Type"/>
+ <xs:element ref="Montant"/>
+ <xs:element ref="ProduitCouvrant"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="Type">
+ <xs:annotation>
+ <xs:documentation>Type
+ Exemples de valeur : Depense, Ticket moderateur, Depassement, Participation forfaitaire, Majoration de TM, PO de base)</xs:documentation>
+ </xs:annotation>
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="Depense"/>
+ <xs:enumeration value="Ticket moderateur"/>
+ <xs:enumeration value="Depassement"/>
+ <xs:enumeration value="Participation forfaitaire"/>
+ <xs:enumeration value="Majoration de TM"/>
+ <xs:enumeration value="PO de base"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="Montant" type="xs:decimal">
+ <xs:annotation>
+ <xs:documentation>Montant</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ProduitCouvrant" type="ReferenceProduitType">
+ <xs:annotation>
+ <xs:documentation>produit couvrant</xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <!--
+ <xs:simpleType name="ReferenceProduitType2">
+ <xs:restriction base="xs:string">
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ -->
+</xs:schema>
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 @@
-<?xml version='1.0' encoding='UTF-8'?><dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"><dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" name="this:Pool0" fileName="BPMN/NewDiagram2-Pool0.bpel">
- <dd:property name="PATH">BPMN/NewDiagram2</dd:property>
- <dd:property name="SVG">BPMN/NewDiagram2.svg</dd:property>
- <dd:provide partnerLink="pool0AndPooldoPlkVar">
- <dd:service name="this:CanonicServiceForPooldo" port="canonicPort" />
- </dd:provide>
+<?xml version='1.0' encoding='UTF-8'?><dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"><dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:xreftst="http://ode.apache.org/test/xsdref-test" xmlns:Pooldo="http://example.com/BPMN/NewDiagram2/Pooldo" xmlns:diag="http://example.com/BPMN/NewDiagram2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BPMN/NewDiagram2/Pool0" name="this:Pool0" fileName="BPMN/NewDiagram2-Pool0.bpel">
+ <dd:property name="PATH">BPMN/NewDiagram2</dd:property>
+ <dd:property name="SVG">BPMN/NewDiagram2.svg</dd:property>
+ <dd:provide partnerLink="pool0AndPooldoPlkVar">
+ <dd:service name="this:CanonicServiceForPooldo" port="canonicPort" />
+ </dd:provide>
</dd:process></dd:deploy>
\ 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);