ode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r740960 [6/6] - in /ode/trunk: ./ axis2-war/src/main/webapp/WEB-INF/conf/ axis2-war/src/test/java/org/apache/ode/axis2/rampart/ axis2-war/src/test/java/org/apache/ode/axis2/rampart/basic/ axis2-war/src/test/java/org/apache/ode/axis2/rampart...
Date Thu, 05 Feb 2009 00:53:39 GMT
Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-policy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-policy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-policy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-policy.xml
Thu Feb  5 00:53:35 2009
@@ -132,14 +132,14 @@
 				<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/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/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/client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/client.jks</ramp:property>
 						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 					</ramp:crypto>
 				</ramp:encryptionCypto>

Added: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-service.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-service.xml?rev=740960&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-service.xml
(added)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sample04-service.xml
Thu Feb  5 00:53:35 2009
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! Licensed under the Apache License, Version 2.0 (the "License");
+ ! you may not use this file except in compliance with the License.
+ ! You may obtain a copy of the License at
+ !
+ !      http://www.apache.org/licenses/LICENSE-2.0
+ !
+ ! Unless required by applicable law or agreed to in writing, software
+ ! distributed under the License is distributed on an "AS IS" BASIS,
+ ! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ! See the License for the specific language governing permissions and
+ ! limitations under the License.
+ !-->
+<!-- services.xml of sample-04 : Secure Conversation -->
+<service>
+	<module ref="rampart" />
+	<module ref="rahas" />
+
+	<wsp:Policy wsu:Id="SecConvPolicy" 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>service</ramp:user>
+					<ramp:encryptionUser>client</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-processes/service.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-processes/service.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>
+	
+    <parameter name="sct-issuer-config">
+		<sct-issuer-config>
+			<cryptoProperties>
+               <crypto provider="org.apache.ws.security.components.crypto.Merlin">
+                    <property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</property>
+                    <property name="org.apache.ws.security.crypto.merlin.file">TestRampartPolicy/secured-processes/sts.jks</property>
+                    <property name="org.apache.ws.security.crypto.merlin.keystore.password">password</property>
+                </crypto>
+			</cryptoProperties>
+			<addRequestedAttachedRef />
+			<addRequestedUnattachedRef />
+
+            <!--
+               Key computation mechanism
+               1 - Use Request Entropy
+               2 - Provide Entropy
+               3 - Use Own Key
+            -->
+            <keyComputation>3</keyComputation>
+
+            <!--
+               proofKeyType element is valid only if the keyComputation is set to 3
+               i.e. Use Own Key
+
+               Valid values are: EncryptedKey & BinarySecret
+            -->
+            <proofKeyType>BinarySecret</proofKeyType>
+        </sct-issuer-config>
+    </parameter>
+	
+	<parameter name="token-canceler-config">
+		<token-canceler-config>
+
+		</token-canceler-config>
+    </parameter>
+	
+</service>

Added: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/service.jks
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/service.jks?rev=740960&view=auto
==============================================================================
Files ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/service.jks
(added) and ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/service.jks
Thu Feb  5 00:53:35 2009 differ

Added: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sts.jks
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sts.jks?rev=740960&view=auto
==============================================================================
Files ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sts.jks (added)
and ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-processes/sts.jks Thu
Feb  5 00:53:35 2009 differ

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/client.jks
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartBasic/client.jks)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/client.jks?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/client.jks&p1=ode/trunk/axis2-war/src/test/resources/TestRampartBasic/client.jks&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.bpel
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.bpel?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.bpel&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.bpel&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.wsdl
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.wsdl?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/HelloWorld2.wsdl&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/HelloWorld2.wsdl&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/config.endpoint&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/config.endpoint&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/deploy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/deploy.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/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?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/echo-service.wsdl&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/echo-service.wsdl&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/testRequest.soap
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/testRequest.soap?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/process-template/testRequest.soap&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/process-template/testRequest.soap&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample01-policy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample01.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample02.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample02-policy.xml
Thu Feb  5 00:53:35 2009
@@ -70,7 +70,7 @@
 				<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/client.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>

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample03.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample03-policy.xml
Thu Feb  5 00:53:35 2009
@@ -76,14 +76,14 @@
 				<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/client.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/client.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>

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/policy-sample04.xml (original)
+++ ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/sample04-policy.xml
Thu Feb  5 00:53:35 2009
@@ -132,14 +132,14 @@
 				<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/client.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/client.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>

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample01-policy.aar&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample01.aar&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample02-policy.aar&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample02.aar&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample03-policy.aar&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample03.aar&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

Copied: ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample04-policy.aar
(from r740569, ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar)
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample04-policy.aar?p2=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/secured-services/services/sample04-policy.aar&p1=ode/trunk/axis2-war/src/test/resources/TestRampartPolicy/services/policy-sample04.aar&r1=740569&r2=740960&rev=740960&view=diff
==============================================================================
    (empty)

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=740960&r1=740959&r2=740960&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 Thu Feb  5 00:53:35
2009
@@ -23,6 +23,7 @@
 import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Iterator;
 import java.util.StringTokenizer;
 
 import javax.servlet.ServletConfig;
@@ -329,10 +330,15 @@
 
         _services.put(uniqueServiceName, portName, odeService);
 
-        // Setting our new service on the receiver, the same receiver handles
-        // all operations so the first one should fit them all
-        AxisOperation firstOp = (AxisOperation) axisService.getOperations().next();
-        ((ODEMessageReceiver) firstOp.getMessageReceiver()).setService(odeService);
+        // Setting our new service on the ODE receiver
+        Iterator operationIterator = axisService.getOperations();
+        while(operationIterator.hasNext()){
+            AxisOperation op = (AxisOperation) operationIterator.next();
+            if(op.getMessageReceiver() instanceof ODEMessageReceiver){
+                ((ODEMessageReceiver) op.getMessageReceiver()).setService(odeService);
+                break;
+            }
+        }
 
         // We're public!
         _axisConfig.addService(axisService);

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=740960&r1=740959&r2=740960&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 Thu Feb  5 00:53:35
2009
@@ -48,6 +48,7 @@
 import org.apache.ode.bpel.iapi.ProcessConf;
 import org.apache.ode.utils.DOMUtils;
 import org.apache.ode.utils.GUID;
+import org.apache.ode.utils.AxisUtils;
 import org.apache.ode.utils.Namespaces;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

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=740960&r1=740959&r2=740960&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 Thu Feb 
5 00:53:35 2009
@@ -36,14 +36,12 @@
 import javax.wsdl.Service;
 import javax.wsdl.extensions.soap.SOAPAddress;
 import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.deployment.ServiceBuilder;
-import org.apache.axis2.description.AxisOperation;
-import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.Parameter;
-import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.transport.jms.JMSConstants;
@@ -53,6 +51,7 @@
 import org.apache.ode.axis2.util.Axis2UriResolver;
 import org.apache.ode.axis2.util.Axis2WSDLLocator;
 import org.apache.ode.bpel.iapi.ProcessConf;
+import org.apache.ode.utils.AxisUtils;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaCollection;
 import org.w3c.dom.Element;
@@ -61,7 +60,7 @@
  * Implementation of Axis Service used by ODE iapi to enlist itself its service. Allows us
to build the service using a
  * WSDL definition using our own receiver.
  */
-public class ODEAxisService extends AxisService {
+public class ODEAxisService {
 
     private static final Log LOG = LogFactory.getLog(ODEAxisService.class);
 
@@ -84,6 +83,7 @@
             serviceBuilder.setServerSide(true);
 
             AxisService axisService = serviceBuilder.populateService();
+            axisService.setParent(axisConfig);
             axisService.setName(axisServiceName);
             axisService.setWsdlFound(true);
             axisService.setCustomWsdl(true);
@@ -97,20 +97,14 @@
             if (wsdlUrl != null) axisService.setFileName(wsdlUrl);
 
             // axis2 service configuration  
-            URI axis2config = pconf.getBaseURI().resolve(wsdlServiceName.getLocalPart()+".axis2");
-            LOG.debug("Looking for Axis2 service configuration file: "+axis2config.toURL());
+            URL service_file = pconf.getBaseURI().resolve(wsdlServiceName.getLocalPart()+".axis2").toURL();
+            LOG.debug("Looking for Axis2 service configuration file: "+service_file);
             try {
-                InputStream ais = axis2config.toURL().openStream();
-                if (ais != null) {
-                    LOG.debug("Configuring service using: "+axis2config.toURL());
-                    ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
-                    ServiceBuilder builder = new ServiceBuilder(ais, configCtx, axisService);
-                    builder.populateService(builder.buildOM());
-                }
+                AxisUtils.configureService(axisService, service_file);
             } catch (FileNotFoundException except) {
-                LOG.debug("Axis2 service configuration not found: " + axis2config);
+                LOG.debug("Axis2 service configuration not found: " + service_file);
             } catch (IOException except) {
-                LOG.warn("Exception while configuring service: " + axis2config, except);
+                LOG.warn("Exception while configuring service: " + service_file, except);
             }
 
             // In doc/lit we need to declare a mapping between operations and message element
names

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java?rev=740960&r1=740959&r2=740960&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
(original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpBindingValidator.java
Thu Feb  5 00:53:35 2009
@@ -138,7 +138,7 @@
                 Matcher m = p.matcher(locationUri);
                 // WSLD spec requires that all message parts must be exactly once in the
url pattern. 
                 // However ODE relaxes this.
-                // The only test is to make sure a part is not mentionned more than once
+                // The only test is to make sure a part is not mentioned more than once
                 if (m.matches() && locationUri.split("(\\(" + name + "\\))", -1).length
!= 2) {
                     throw new IllegalArgumentException(httpMsgs.msgInvalidURIPattern(binding,
bindingOperation, locationUri));
                 }

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java?rev=740960&r1=740959&r2=740960&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
(original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/HttpMethodConverter.java
Thu Feb  5 00:53:35 2009
@@ -243,7 +243,7 @@
      * <p/>
      * Finally go through the list of {@linkplain Namespaces.ODE_HTTP_EXTENSION_NS}{@code
:header} elements included in the input binding.
      * For each of them, set the HTTP Request Header with the static value defined by the
attribute {@linkplain Namespaces.ODE_HTTP_EXTENSION_NS}{@code :value},
-     * or the part value mentionned in the attribute {@linkplain Namespaces.ODE_HTTP_EXTENSION_NS}{@code
:part}.
+     * or the part value mentioned in the attribute {@linkplain Namespaces.ODE_HTTP_EXTENSION_NS}{@code
:part}.
      * <p/>
      * Finally, set the 'Accept' header if the output content type of the operation exists.
      * <p/>

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java?rev=740960&r1=740959&r2=740960&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java (original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/httpbinding/ProxyConf.java Thu Feb
 5 00:53:35 2009
@@ -92,7 +92,7 @@
 
     /**
      *
-     * @return true if the targetHost is mentionned in the system properties "http.nonProxyHosts"
+     * @return true if the targetHost is mentioned in the system properties "http.nonProxyHosts"
      * @see http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html
      */
     public static boolean isNonProxyHost(String targetHost) {

Modified: ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java?rev=740960&r1=740959&r2=740960&view=diff
==============================================================================
--- ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
(original)
+++ ode/trunk/axis2/src/main/java/org/apache/ode/axis2/soapbinding/SoapExternalService.java
Thu Feb  5 00:53:35 2009
@@ -51,11 +51,7 @@
 import org.apache.ode.il.epr.EndpointFactory;
 import org.apache.ode.il.epr.MutableEndpoint;
 import org.apache.ode.il.epr.WSAEndpoint;
-import org.apache.ode.utils.CollectionUtils;
-import org.apache.ode.utils.DOMUtils;
-import org.apache.ode.utils.Namespaces;
-import org.apache.ode.utils.WatchDog;
-import org.apache.ode.utils.GUID;
+import org.apache.ode.utils.*;
 import org.apache.ode.utils.fs.FileUtils;
 import org.apache.ode.utils.uuid.UUID;
 import org.apache.ode.utils.wsdl.Messages;
@@ -407,26 +403,9 @@
             // and load the new config.
             init(); // create a new ServiceClient instance
             try {
-                InputStream ais = file.toURI().toURL().openStream();
-                if (ais != null) {
-                    if (__log.isDebugEnabled()) __log.debug("Configuring service " + _serviceName
+ " using: " + file);
-                    ServiceBuilder builder = new ServiceBuilder(ais, _configContext, anonymousService);
-                    builder.populateService(builder.buildOM());
-                    // do not allow the service.xml file to change the service name 
-                    anonymousService.setName(serviceName);
-
-                    // the service builder only updates the module list but do not engage
them
-                    // module have to be engaged manually,
-                    for (int i = 0; i < anonymousService.getModules().size(); i++) {
-                        String moduleRef = (String) anonymousService.getModules().get(i);
-                        AxisModule module = _axisConfig.getModule(moduleRef);
-                        if (module != null) {
-                            anonymousService.engageModule(module);
-                        } else {
-                            throw new AxisFault("Unable to engage module : " + moduleRef);
-                        }
-                    }
-                }
+                 AxisUtils.configureService(_configContext, anonymousService, file.toURI().toURL());
+                 // do not allow the service.xml file to change the service name
+                 anonymousService.setName(serviceName);
             } catch (Exception e) {
                 if (__log.isWarnEnabled()) __log.warn("Exception while configuring service:
" + _serviceName, e);
                 throw new RuntimeException("Exception while configuring service: " + _serviceName,
e);

Added: ode/trunk/utils/src/main/java/org/apache/ode/utils/AxisUtils.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/AxisUtils.java?rev=740960&view=auto
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/AxisUtils.java (added)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/AxisUtils.java Thu Feb  5 00:53:35
2009
@@ -0,0 +1,64 @@
+package org.apache.ode.utils;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.axis2.deployment.ServiceBuilder;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.AxisModule;
+import org.apache.axis2.AxisFault;
+
+import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ *
+ */
+public class AxisUtils {
+
+    private static final Log log = LogFactory.getLog(AxisUtils.class);
+
+    public static void configureService(AxisService axisService, URL service_file) throws
IOException, XMLStreamException, AxisFault {
+        configureService(new ConfigurationContext(axisService.getAxisConfiguration()), axisService,
service_file);
+    }
+
+    /**
+     * Configure a service instance woth the specified service.xml document.
+     * If modules are mentioned in the document, <code>this</code> method will
make sure they are properly engaged and engage them if necessary.
+     * The modules have to be available in the module repository otherwise an AxisFault will
be thrown.
+     *
+     * @param axisService  the service to configure
+     * @param service_file the service.xm document to configure the service with
+     * @throws IOException
+     * @throws XMLStreamException
+     * @throws org.apache.axis2.AxisFault if a module listed in the service.xml is not available
in the module repository
+     */
+    public static void configureService(ConfigurationContext configCtx, AxisService axisService,
URL service_file) throws IOException, XMLStreamException, AxisFault {
+        InputStream ais = service_file.openStream();
+        log.debug("Looking for Axis2 service configuration file: " + service_file);
+        if (ais != null) {
+            log.debug("Configuring service " + axisService.getName() + " using: " + service_file);
+            try {
+                if (configCtx == null)
+                    configCtx = new ConfigurationContext(axisService.getAxisConfiguration());
+                ServiceBuilder builder = new ServiceBuilder(ais, configCtx, axisService);
+                builder.populateService(builder.buildOM());
+            } finally {
+                ais.close();
+            }
+            // the service builder only updates the module list but do not engage them
+            // modules have to be engaged manually,
+            for (int i = 0; i < axisService.getModules().size(); i++) {
+                String moduleRef = (String) axisService.getModules().get(i);
+                AxisModule module = axisService.getAxisConfiguration().getModule(moduleRef);
+                if (module != null) {
+                    axisService.engageModule(module);
+                } else {
+                    throw new AxisFault("Unable to engage module: " + moduleRef);
+                }
+            }
+        }
+    }
+}

Modified: ode/trunk/utils/src/main/java/org/apache/ode/utils/URITemplate.java
URL: http://svn.apache.org/viewvc/ode/trunk/utils/src/main/java/org/apache/ode/utils/URITemplate.java?rev=740960&r1=740959&r2=740960&view=diff
==============================================================================
--- ode/trunk/utils/src/main/java/org/apache/ode/utils/URITemplate.java (original)
+++ ode/trunk/utils/src/main/java/org/apache/ode/utils/URITemplate.java Thu Feb  5 00:53:35
2009
@@ -279,7 +279,7 @@
         String var = (String) e.getKey();
         String defaultValue = (String) e.getValue();
         boolean hasDefaultValue = defaultValue != null;
-        // this boolean indicates if the var is mentionned in the map, not that the associated
value is not null.
+        // this boolean indicates if the var is mentioned in the map, not that the associated
value is not null.
         boolean varDefined = nameValuePairs.containsKey(var);
         String providedValue = nameValuePairs.get(var);
         String res;



Mime
View raw message