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:15:28 UTC
svn commit: r745274 [6/14] - in /ode/trunk: ./ axis2-war/src/main/webapp/
axis2-war/src/main/webapp/WEB-INF/ axis2-war/src/main/webapp/WEB-INF/conf/
axis2-war/src/main/webapp/css/ axis2-war/src/main/webapp/js/
axis2-war/src/main/webapp/js/bubbling/ axi...
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml Tue Feb 17 22:15:22 2009
@@ -17,18 +17,18 @@
~ 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:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl"
xmlns:dns="{sample.namespace}">
- <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="samplePartnerLink">
- <service name="dns:{sample.service.name}" port="{sample.service.name}SOAP11port_http"/>
+ <service name="dns:{sample.service.name}" port="{sample.service.name}SOAP11port_http"/>
</invoke>
</process>
</deploy>
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl Tue Feb 17 22:15:22 2009
@@ -8,12 +8,12 @@
xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- targetNamespace="{sample.namespace}">
+ targetNamespace="{sample.namespace}">
<wsdl:types>
- <xs:schema xmlns:ns="{sample.namespace}"
+ <xs:schema xmlns:ns="{sample.namespace}"
attributeFormDefault="qualified"
elementFormDefault="qualified"
- targetNamespace="{sample.namespace}">
+ targetNamespace="{sample.namespace}">
<xs:element name="echo">
<xs:complexType>
<xs:sequence>
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml Tue Feb 17 22:15:22 2009
@@ -16,39 +16,39 @@
! limitations under the License.
!-->
<wsp:Policy wsu:Id="UTOverTransport" 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:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:TransportToken>
- <wsp:Policy>
- <!--<sp:HttpsToken RequireClientCertificate="false"/>-->
- </wsp:Policy>
- </sp:TransportToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256/>
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Lax/>
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp/>
- </wsp:Policy>
- </sp:TransportBinding>
- <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
- <wsp:Policy>
- <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
- </wsp:Policy>
- </sp:SignedSupportingTokens>
-
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
- <ramp:user>alice</ramp:user>
- <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample01.PWCBHandler</ramp:passwordCallbackClass>
- </ramp:RampartConfig>
-
- </wsp:All>
- </wsp:ExactlyOne>
+ <wsp:ExactlyOne>
+ <wsp:All>
+ <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:TransportToken>
+ <wsp:Policy>
+ <!--<sp:HttpsToken RequireClientCertificate="false"/>-->
+ </wsp:Policy>
+ </sp:TransportToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256/>
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Lax/>
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp/>
+ </wsp:Policy>
+ </sp:TransportBinding>
+ <sp:SignedSupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+ <wsp:Policy>
+ <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+ <ramp:user>alice</ramp:user>
+ <ramp:passwordCallbackClass>org.apache.rampart.samples.policy.sample01.PWCBHandler</ramp:passwordCallbackClass>
+ </ramp:RampartConfig>
+
+ </wsp:All>
+ </wsp:ExactlyOne>
</wsp:Policy>
\ No newline at end of file
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml Tue Feb 17 22:15:22 2009
@@ -16,66 +16,66 @@
! limitations under the License.
!-->
<wsp:Policy wsu:Id="SigOnly" 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>
+ <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>
- <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.sample02.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: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.sample02.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:RampartConfig>
- </wsp:All>
- </wsp:ExactlyOne>
+ </wsp:All>
+ </wsp:ExactlyOne>
</wsp:Policy>
\ No newline at end of file
Modified: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml Tue Feb 17 22:15:22 2009
@@ -17,78 +17,78 @@
!-->
<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>
+ <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:RequireThumbprintReference/>
<sp:WssX509V1Token10/>
- </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>
+ </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:RequireThumbprintReference/>
<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: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/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml Tue Feb 17 22:15:22 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>
\ No newline at end of file
Modified: ode/trunk/axis2-war/src/test/resources/TestSoapHeader/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestSoapHeader/deploy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestSoapHeader/deploy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestSoapHeader/deploy.xml Tue Feb 17 22:15:22 2009
@@ -17,12 +17,12 @@
~ 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>
+ <process name="pns:HeaderTest">
+ <active>true</active>
<invoke partnerLink="dummyPartnerLink">
<service name="dns:DummyService" port="DummyServiceSOAP11port_http"/>
</invoke>
Modified: ode/trunk/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl (original)
+++ ode/trunk/axis2-war/src/test/resources/TestStructuredFault/HelloWorld2.wsdl Tue Feb 17 22:15:22 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/trunk/axis2-war/src/test/resources/TestStructuredFault/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestStructuredFault/deploy.xml?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestStructuredFault/deploy.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestStructuredFault/deploy.xml Tue Feb 17 22:15:22 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/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd (original)
+++ ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/ListeProduit.xsd Tue Feb 17 22:15:22 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: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/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd (original)
+++ ode/trunk/axis2-war/src/test/resources/XSDReferences/XSDSchema/xreftst.xsd Tue Feb 17 22:15:22 2009
@@ -2,69 +2,69 @@
<!-- 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: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/trunk/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/BindingContextImpl.java Tue Feb 17 22:15:22 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/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java Tue Feb 17 22:15:22 2009
@@ -321,7 +321,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);
AxisService axisService = ODEAxisService.createService(
@@ -351,7 +351,7 @@
if (extService != null)
return extService;
- Definition def = pconf.getDefinitionForService(serviceName);
+ Definition def = pconf.getDefinitionForService(serviceName);
try {
if (WsdlUtils.useHTTPBinding(def, serviceName, portName)) {
if(__log.isDebugEnabled())__log.debug("Creating HTTP-bound external service " + serviceName);
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEService.java Tue Feb 17 22:15:22 2009
@@ -59,10 +59,10 @@
* @author Matthieu Riou <mriou at apache dot org>
*/
public class ODEService {
- private static final Log __log = LogFactory.getLog(ODEService.class);
+ private static final Log __log = LogFactory.getLog(ODEService.class);
public static final String TARGET_SESSION_ENDPOINT = "targetSessionEndpoint";
- public static final String CALLBACK_SESSION_ENDPOINT = "callbackSessionEndpoint";
+ public static final String CALLBACK_SESSION_ENDPOINT = "callbackSessionEndpoint";
private AxisService _axisService;
private BpelServer _server;
@@ -77,8 +77,8 @@
_axisService = axisService;
_server = server;
_serviceName = serviceName;
- _pconf = pconf;
- _wsdlDef = pconf.getDefinitionForService(serviceName);
+ _pconf = pconf;
+ _wsdlDef = pconf.getDefinitionForService(serviceName);
_portName = portName;
_serviceRef = EndpointFactory.convertToWSA(createServiceRef(genEPRfromWSDL(_wsdlDef, serviceName, portName)));
_converter = new SoapMessageConverter(_wsdlDef, serviceName, portName);
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/ODEAxisService.java Tue Feb 17 22:15:22 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;
@@ -152,94 +152,94 @@
* @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);
- return (index != -1) ? serviceName.substring(destinationPrefix.length()) : serviceName;
+ destinationPrefix = baseUri + "/";
+ index = serviceName.indexOf(destinationPrefix);
+ return (index != -1) ? serviceName.substring(destinationPrefix.length()) : serviceName;
} else {
- return serviceName.substring(index);
+ return serviceName.substring(index);
}
- }
+ }
- 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) {
- throw new OdeFault("Unable to find service " + wsdlServiceName + " from service WSDL definition "
- + wsdlDefinition.getDocumentBaseURI());
- }
- Port port = service.getPort(portName);
- if (port == null) {
- throw new OdeFault("Couldn't find port " + portName + " in definition " + wsdlServiceName);
- }
- for (Object oext : port.getExtensibilityElements()) {
- if (oext instanceof SOAPAddress)
- url = ((SOAPAddress) oext).getLocationURI();
- }
- 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 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) {
+ throw new OdeFault("Unable to find service " + wsdlServiceName + " from service WSDL definition "
+ + wsdlDefinition.getDocumentBaseURI());
+ }
+ Port port = service.getPort(portName);
+ if (port == null) {
+ throw new OdeFault("Couldn't find port " + portName + " in definition " + wsdlServiceName);
+ }
+ for (Object oext : port.getExtensibilityElements()) {
+ if (oext instanceof SOAPAddress)
+ url = ((SOAPAddress) oext).getLocationURI();
+ }
+ 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:");
- }
-
- public static String extractServiceName(ProcessConf pconf, QName wsdlServiceName, String portName)
- throws AxisFault {
- String serviceName = parseURLForService(extractEndpointUri(pconf, wsdlServiceName, portName), deriveBaseServiceUri(pconf));
- if (serviceName == null) {
- throw new OdeFault("The soap:address used for service WSDL definition " + wsdlServiceName + " and port "
- + portName + " should be of the form http://hostname:port/ode/processes/myProcessEndpointName");
- }
- return serviceName;
- }
-
- /**
- * Obtain the service name from the request URL. The request URL is expected to use the path "/processes/" under
- * 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://";
- }
- int index = path.indexOf(servicePrefix);
- if (-1 != index) {
- String service;
-
- int serviceStart = index + servicePrefix.length();
- if (path.length() > serviceStart + 1) {
- service = path.substring(serviceStart);
- // Path may contain query string, not interesting for us.
- int queryIndex = service.indexOf('?');
- if (queryIndex > 0) {
- service = service.substring(0, queryIndex);
- }
- // Qualify shared JMS names with unique baseUri
- if (path.startsWith("jms")) {
- boolean slashPresent = baseUri.endsWith("/") || service.startsWith("/");
- service = baseUri + (slashPresent ? "" : "/") + service;
- }
- return service;
- }
- }
- return null;
- }
+ 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));
+ if (serviceName == null) {
+ throw new OdeFault("The soap:address used for service WSDL definition " + wsdlServiceName + " and port "
+ + portName + " should be of the form http://hostname:port/ode/processes/myProcessEndpointName");
+ }
+ return serviceName;
+ }
+
+ /**
+ * Obtain the service name from the request URL. The request URL is expected to use the path "/processes/" under
+ * 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://";
+ }
+ int index = path.indexOf(servicePrefix);
+ if (-1 != index) {
+ String service;
+
+ int serviceStart = index + servicePrefix.length();
+ if (path.length() > serviceStart + 1) {
+ service = path.substring(serviceStart);
+ // Path may contain query string, not interesting for us.
+ int queryIndex = service.indexOf('?');
+ if (queryIndex > 0) {
+ service = service.substring(0, queryIndex);
+ }
+ // Qualify shared JMS names with unique baseUri
+ if (path.startsWith("jms")) {
+ boolean slashPresent = baseUri.endsWith("/") || service.startsWith("/");
+ service = baseUri + (slashPresent ? "" : "/") + service;
+ }
+ return service;
+ }
+ }
+ return null;
+ }
/*
* Generates a URI of the following form:
@@ -247,31 +247,31 @@
* 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;
+ }
+
private static void declarePartsElements(Definition wsdlDefinition, QName wsdlServiceName, String axisServiceName,
String portName) {
List wsldOps = wsdlDefinition.getService(wsdlServiceName).getPort(portName).getBinding().getPortType()
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionInHandler.java Tue Feb 17 22:15:22 2009
@@ -39,7 +39,7 @@
* context.
*/
public class SessionInHandler extends AbstractHandler {
- private static final long serialVersionUID = -806564877582696569L;
+ private static final long serialVersionUID = -806564877582696569L;
private static final Log __log = LogFactory.getLog(SessionInHandler.class);
@@ -51,8 +51,8 @@
// Checking if a session identifier has been provided for a stateful endpoint
OMElement wsaToSession = header.getFirstChildWithName(new QName(Namespaces.ODE_SESSION_NS, "session"));
if (wsaToSession == null) {
- // perhaps there is an old intalio header?
- wsaToSession = header.getFirstChildWithName(new QName(Namespaces.INTALIO_SESSION_NS, "session"));
+ // perhaps there is an old intalio header?
+ wsaToSession = header.getFirstChildWithName(new QName(Namespaces.INTALIO_SESSION_NS, "session"));
}
if (wsaToSession != null) {
// Building an endpoint supposed to target the right instance
@@ -80,11 +80,11 @@
// Seeing if there's a callback, in case our client would be stateful as well
OMElement callback = header.getFirstChildWithName(new QName(Namespaces.ODE_SESSION_NS, "callback"));
if (callback == null) {
- // is there an old intalio header?
- callback = header.getFirstChildWithName(new QName(Namespaces.INTALIO_SESSION_NS, "callback"));
+ // is there an old intalio header?
+ callback = header.getFirstChildWithName(new QName(Namespaces.INTALIO_SESSION_NS, "callback"));
}
if (callback != null) {
- OMElement callbackSession = callback.getFirstChildWithName(new QName(callback.getNamespace().getNamespaceURI(), "session"));
+ OMElement callbackSession = callback.getFirstChildWithName(new QName(callback.getNamespace().getNamespaceURI(), "session"));
if (callbackSession != null) {
// Building an endpoint that represents our client (we're supposed to call him later on)
Document doc = DOMUtils.newDocument();
Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java?rev=745274&r1=745273&r2=745274&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/hooks/SessionOutHandler.java Tue Feb 17 22:15:22 2009
@@ -65,9 +65,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());
@@ -79,9 +79,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());
@@ -90,7 +90,7 @@
header.addChild(messageIdElem);
messageIdElem.setText(messageId);
}
-
+
if (targetEpr.getSessionId() != null) {
OMElement session = factory.createSOAPHeaderBlock("session", odeSessNS);
header.addChild(session);