axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r475341 [13/15] - in /webservices/axis2/branches/java/new-trunk: ./ modules/adb-codegen/ modules/adb/ modules/addressing/test-resources/invalid-cardinality-messages/final/ modules/addressing/test-resources/invalid-cardinality-messages/submi...
Date Wed, 15 Nov 2006 18:16:07 GMT
Modified: webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample01/policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample01/policy.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample01/policy.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample01/policy.xml Wed Nov 15 10:15:56 2006
@@ -1,37 +1,37 @@
-<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: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:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample02/policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample02/policy.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample02/policy.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample02/policy.xml Wed Nov 15 10:15:56 2006
@@ -1,64 +1,64 @@
-<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>
-
-			<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">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: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>
+
+			<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">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:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample03/policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample03/policy.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample03/policy.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample03/policy.xml Wed Nov 15 10:15:56 2006
@@ -1,74 +1,74 @@
-<wsp:Policy wsu:Id="SigEncr" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:InitiatorToken>
-						<wsp:Policy>
-							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-								<wsp:Policy>
-									<sp:WssX509V3Token10/>
-								</wsp:Policy>
-							</sp:X509Token>
-						</wsp:Policy>
-					</sp:InitiatorToken>
-					<sp:RecipientToken>
-						<wsp:Policy>
-							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
-								<wsp:Policy>
-									<sp:WssX509V3Token10/>
-								</wsp:Policy>
-							</sp:X509Token>
-						</wsp:Policy>
-					</sp:RecipientToken>
-					<sp:AlgorithmSuite>
-						<wsp:Policy>
-							<sp:TripleDesRsa15/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Strict/>
-						</wsp:Policy>
-					</sp:Layout>
-					<sp:IncludeTimestamp/>
-					<sp:OnlySignEntireHeadersAndBody/>
-				</wsp:Policy>
-			</sp:AsymmetricBinding>
-			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefKeyIdentifier/>
-					<sp:MustSupportRefIssuerSerial/>
-				</wsp:Policy>
-			</sp:Wss10>
-			<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<sp:Body/>
-			</sp:SignedParts>
-			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<sp:Body/>
-			</sp:EncryptedParts>
-
-			<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">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">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>
+<wsp:Policy wsu:Id="SigEncr" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+	<wsp:ExactlyOne>
+		<wsp:All>
+			<sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:InitiatorToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+								<wsp:Policy>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:InitiatorToken>
+					<sp:RecipientToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+								<wsp:Policy>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:RecipientToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:TripleDesRsa15/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Strict/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:AsymmetricBinding>
+			<sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:MustSupportRefKeyIdentifier/>
+					<sp:MustSupportRefIssuerSerial/>
+				</wsp:Policy>
+			</sp:Wss10>
+			<sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
+			</sp:SignedParts>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
+			</sp:EncryptedParts>
+
+			<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">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">client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+					</ramp:crypto>
+				</ramp:encryptionCypto>
+			</ramp:RampartConfig>
+
+		</wsp:All>
+	</wsp:ExactlyOne>
+</wsp:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample04/policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample04/policy.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample04/policy.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/security/policy/sample04/policy.xml Wed Nov 15 10:15:56 2006
@@ -1,194 +1,194 @@
-<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">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">client.jks</ramp:property>
-						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
-					</ramp:crypto>
-				</ramp:encryptionCypto>
-				
-				<ramp:tokenIssuerPolicy xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-					<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>
-				</ramp:tokenIssuerPolicy>
-				
-			</ramp:RampartConfig>
-		</wsp:All>
-	</wsp:ExactlyOne>
+<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">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">client.jks</ramp:property>
+						<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
+					</ramp:crypto>
+				</ramp:encryptionCypto>
+				
+				<ramp:tokenIssuerPolicy xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<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>
+				</ramp:tokenIssuerPolicy>
+				
+			</ramp:RampartConfig>
+		</wsp:All>
+	</wsp:ExactlyOne>
 </wsp:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/servicelifecycle/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/servicelifecycle/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/servicelifecycle/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/servicelifecycle/build.xml Wed Nov 15 10:15:56 2006
@@ -1,102 +1,102 @@
-<project basedir="." default="build" name="Library">
-
-    <property environment="env"/>
-    <property name="service-name" value="Library.aar"/>
-    <property name="dest.dir" value="target"/>
-    <property name="axis2.home" value="../../" />
-
-	<property name="repository.path" value="${axis2.home}/repository/services" />
-
-    <property name="dest.dir.classes" value="${dest.dir}/classes"/>
-
-    <property name="dest.dir.lib" value="${dest.dir}/lib"/>
-    <property name="catalina-modules"
-              value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/>
-
-    <path id="build.class.path">
-        <fileset dir="../../lib">
-            <include name="*.jar"/>
-        </fileset>
-    </path>
-
-    <target name="clean">
-        <delete dir="${dest.dir}"/>
-    </target>
-
-    <target name="prepare" depends="clean">
-
-        <mkdir dir="${dest.dir}"/>
-
-        <mkdir dir="${dest.dir.classes}"/>
-
-        <mkdir dir="${dest.dir.classes}/META-INF"/>
-
-    </target>
-
-    <target name="build" depends="prepare">
-
-        <mkdir dir="${dest.dir}"/>
-
-        <mkdir dir="${dest.dir.classes}"/>
-        <mkdir dir="${dest.dir.classes}/META-INF"/>
-
-        <copy file="src/META-INF/services.xml"
-              tofile="${dest.dir.classes}/META-INF/services.xml"
-              overwrite="true"/>
-
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
-            <classpath refid="build.class.path"/>
-        </javac>
-
-        <jar basedir="${dest.dir.classes}"
-             destfile="${dest.dir}/${service-name}"/>
-
-    </target>
-
-     <target name="generate.service" depends="prepare">
-
-        <mkdir dir="${dest.dir}"/>
-
-        <mkdir dir="${dest.dir.classes}"/>
-        <mkdir dir="${dest.dir.classes}/META-INF"/>
-
-        <copy file="src/META-INF/services.xml"
-              tofile="${dest.dir.classes}/META-INF/services.xml"
-              overwrite="true"/>
-
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
-            <classpath refid="build.class.path"/>
-        </javac>
-
-        <jar basedir="${dest.dir.classes}"
-             destfile="${repository.path}/${service-name}"/>
-
-    </target>
-
-
-
-    <target name="run.client" depends="prepare">
-        <mkdir dir="${dest.dir}"/>
-        <mkdir dir="${dest.dir.classes}"/>
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**">
-            <classpath>
-                <fileset dir="../../lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-        </javac>
-
-        <java classname="client.LibraryServiceClient">
-            <classpath>
-                <pathelement location="${dest.dir.classes}"/>
-                <fileset dir="../../lib">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
-        </java>
-	</target>
-    <target name="copy.to.tomcat" depends="build">
-        <copy file="${dest.dir}/${service-name}" todir="${catalina-modules}"/>
-    </target>
-
-</project>
+<project basedir="." default="build" name="Library">
+
+    <property environment="env"/>
+    <property name="service-name" value="Library.aar"/>
+    <property name="dest.dir" value="target"/>
+    <property name="axis2.home" value="../../" />
+
+	<property name="repository.path" value="${axis2.home}/repository/services" />
+
+    <property name="dest.dir.classes" value="${dest.dir}/classes"/>
+
+    <property name="dest.dir.lib" value="${dest.dir}/lib"/>
+    <property name="catalina-modules"
+              value="${env.CATALINA_HOME}/webapps/axis2/WEB-INF/services"/>
+
+    <path id="build.class.path">
+        <fileset dir="../../lib">
+            <include name="*.jar"/>
+        </fileset>
+    </path>
+
+    <target name="clean">
+        <delete dir="${dest.dir}"/>
+    </target>
+
+    <target name="prepare" depends="clean">
+
+        <mkdir dir="${dest.dir}"/>
+
+        <mkdir dir="${dest.dir.classes}"/>
+
+        <mkdir dir="${dest.dir.classes}/META-INF"/>
+
+    </target>
+
+    <target name="build" depends="prepare">
+
+        <mkdir dir="${dest.dir}"/>
+
+        <mkdir dir="${dest.dir.classes}"/>
+        <mkdir dir="${dest.dir.classes}/META-INF"/>
+
+        <copy file="src/META-INF/services.xml"
+              tofile="${dest.dir.classes}/META-INF/services.xml"
+              overwrite="true"/>
+
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
+            <classpath refid="build.class.path"/>
+        </javac>
+
+        <jar basedir="${dest.dir.classes}"
+             destfile="${dest.dir}/${service-name}"/>
+
+    </target>
+
+     <target name="generate.service" depends="prepare">
+
+        <mkdir dir="${dest.dir}"/>
+
+        <mkdir dir="${dest.dir.classes}"/>
+        <mkdir dir="${dest.dir.classes}/META-INF"/>
+
+        <copy file="src/META-INF/services.xml"
+              tofile="${dest.dir.classes}/META-INF/services.xml"
+              overwrite="true"/>
+
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
+            <classpath refid="build.class.path"/>
+        </javac>
+
+        <jar basedir="${dest.dir.classes}"
+             destfile="${repository.path}/${service-name}"/>
+
+    </target>
+
+
+
+    <target name="run.client" depends="prepare">
+        <mkdir dir="${dest.dir}"/>
+        <mkdir dir="${dest.dir.classes}"/>
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**">
+            <classpath>
+                <fileset dir="../../lib">
+                    <include name="*.jar"/>
+                </fileset>
+            </classpath>
+        </javac>
+
+        <java classname="client.LibraryServiceClient">
+            <classpath>
+                <pathelement location="${dest.dir.classes}"/>
+                <fileset dir="../../lib">
+                    <include name="*.jar"/>
+                </fileset>
+            </classpath>
+        </java>
+	</target>
+    <target name="copy.to.tomcat" depends="build">
+        <copy file="${dest.dir}/${service-name}" todir="${catalina-modules}"/>
+    </target>
+
+</project>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/build.xml Wed Nov 15 10:15:56 2006
@@ -1,65 +1,65 @@
-<project name="SOAPWithAttachmentsSample" default="generate.service">
-	<property environment="env" />
-	<property name="axis2.home" value="../../" />
-	<property name="axis2.repo" value="${axis2.home}/repository" />
-	<property name="build.dir" value="build" />
-	<property name="client.classes.dir" value="${build.dir}/classes" />
-	<path id="axis.classpath">
-		<fileset dir="${axis2.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-		<pathelement location="build/swaSampleClient.jar" />
-	</path>
-
-	<target name="generate.service" depends="compile">
-		<jar destfile="${build.dir}/sample-swa.aar">	
-			<fileset dir="resources/">
-				<include name="META-INF/services.xml" />
-			</fileset>
-			<fileset dir="${build.dir}/classes">
-				<include name="sample/soapwithattachments/service/**/*.class" />
-			</fileset>
-		</jar>
-		<copy file="${build.dir}/sample-swa.aar" tofile="${axis2.home}/repository/services/sample-swa.aar" overwrite="true" />
-	</target>
-
-	<target name="compile">
-		<mkdir dir="${client.classes.dir}" />
-		<!-- Compile client -->
-		<javac debug="on"  srcdir="src" destdir="${client.classes.dir}">
-			<classpath refid="axis.classpath" />
-		</javac>
-	</target>
-	<target name="check-parameters">
-		<condition property="parameters.set">
-			<and>
-				<isset property="dest" />
-				<isset property="file" />
-			</and>
-		</condition>
-		<!-- This is a hack to get a if-else working in ant. Some much more "ANTy" person is welcome to improve this -->
-		<antcall target="print-usage" />
-	</target>
-
-	<target name="print-usage" unless="parameters.set">
-		<echo message="ant -Dfile &lt;file to be transfered&gt;  -Ddest &lt;name of the destination file&gt;" />
-	</target>
-
-	<target name="run.client" depends="compile,check-parameters" if="parameters.set">
-		<jar destfile="${build.dir}/swaSampleClient.jar">
-			<fileset dir="${build.dir}/classes">
-				<include name="sample/soapwithattachments/client/**/*.class" />
-			</fileset>
-		</jar>
-		<java classname="sample.soapwithattachments.client.SWAClient" classpathref="axis.classpath" fork="true">
-			<arg value="-file" />
-			<arg value="${file}" />
-			<arg value="-dest" />
-			<arg value="${dest}" />
-			<jvmarg value="-Daxis2.repo=${axis2.repo}" />
-		</java>
-	</target>
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-</project>
+<project name="SOAPWithAttachmentsSample" default="generate.service">
+	<property environment="env" />
+	<property name="axis2.home" value="../../" />
+	<property name="axis2.repo" value="${axis2.home}/repository" />
+	<property name="build.dir" value="build" />
+	<property name="client.classes.dir" value="${build.dir}/classes" />
+	<path id="axis.classpath">
+		<fileset dir="${axis2.home}/lib">
+			<include name="*.jar" />
+		</fileset>
+		<pathelement location="build/swaSampleClient.jar" />
+	</path>
+
+	<target name="generate.service" depends="compile">
+		<jar destfile="${build.dir}/sample-swa.aar">	
+			<fileset dir="resources/">
+				<include name="META-INF/services.xml" />
+			</fileset>
+			<fileset dir="${build.dir}/classes">
+				<include name="sample/soapwithattachments/service/**/*.class" />
+			</fileset>
+		</jar>
+		<copy file="${build.dir}/sample-swa.aar" tofile="${axis2.home}/repository/services/sample-swa.aar" overwrite="true" />
+	</target>
+
+	<target name="compile">
+		<mkdir dir="${client.classes.dir}" />
+		<!-- Compile client -->
+		<javac debug="on"  srcdir="src" destdir="${client.classes.dir}">
+			<classpath refid="axis.classpath" />
+		</javac>
+	</target>
+	<target name="check-parameters">
+		<condition property="parameters.set">
+			<and>
+				<isset property="dest" />
+				<isset property="file" />
+			</and>
+		</condition>
+		<!-- This is a hack to get a if-else working in ant. Some much more "ANTy" person is welcome to improve this -->
+		<antcall target="print-usage" />
+	</target>
+
+	<target name="print-usage" unless="parameters.set">
+		<echo message="ant -Dfile &lt;file to be transfered&gt;  -Ddest &lt;name of the destination file&gt;" />
+	</target>
+
+	<target name="run.client" depends="compile,check-parameters" if="parameters.set">
+		<jar destfile="${build.dir}/swaSampleClient.jar">
+			<fileset dir="${build.dir}/classes">
+				<include name="sample/soapwithattachments/client/**/*.class" />
+			</fileset>
+		</jar>
+		<java classname="sample.soapwithattachments.client.SWAClient" classpathref="axis.classpath" fork="true">
+			<arg value="-file" />
+			<arg value="${file}" />
+			<arg value="-dest" />
+			<arg value="${dest}" />
+			<jvmarg value="-Daxis2.repo=${axis2.repo}" />
+		</java>
+	</target>
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+</project>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/resources/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/resources/META-INF/services.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/resources/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/soapwithattachments/resources/META-INF/services.xml Wed Nov 15 10:15:56 2006
@@ -1,10 +1,10 @@
-<service name="SWASampleService">
-    <description>
-        This is a sample Web Service for illustrating Attachments API of Axis2
-    </description>
-    <parameter name="ServiceClass" locked="false">sample.soapwithattachments.service.AttachmentService</parameter>
-    <operation name="uploadFile">
-        <actionMapping>urn:uploadFile</actionMapping>
-        <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
-    </operation>
-</service>
+<service name="SWASampleService">
+    <description>
+        This is a sample Web Service for illustrating Attachments API of Axis2
+    </description>
+    <parameter name="ServiceClass" locked="false">sample.soapwithattachments.service.AttachmentService</parameter>
+    <operation name="uploadFile">
+        <actionMapping>urn:uploadFile</actionMapping>
+        <messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+    </operation>
+</service>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/userguide/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/userguide/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/userguide/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/userguide/build.xml Wed Nov 15 10:15:56 2006
@@ -1,124 +1,124 @@
-<project name="samples" default="generate.service">
-    <property name="mainDir" value="../.."/>
-    <property name="classes.dir" value="build/classes"/>
-    <path id="axis.classpath">
-        <fileset dir="../../lib">
-            <include name="*.jar"/>
-        </fileset>
-        <pathelement location="build/userguide.jar"/>
-    </path>
-
-    <target name="run.client.all"
-            depends="run.client.ping,run.client.blocking,run.client.blockingdual,run.client.nonblocking,run.client.nonblockingdual,run.client.servicewithmodule">
-    </target>
-    
-    <target name="compile">
-    		<mkdir dir="${classes.dir}" />
-		<javac srcdir="src" destdir="${classes.dir}">
-			<classpath refid="axis.classpath" />
-		</javac>
-		<jar destfile="build/userguide.jar">
-            		<fileset dir="${classes.dir}">
-                		<include name="userguide/**"/>
-            		</fileset>
-       		</jar>
-    </target>
-    
-    <target name="generate.service" depends="compile">
-            <jar destfile="build/MyService.aar">
-            <fileset dir="src/userguide/example1/">
-                <include name="META-INF/**"/>
-            </fileset>
-            <fileset dir="${classes.dir}">
-                <include name="userguide/example1/**/*.class"/>
-            </fileset>
-        </jar>
-        <copy file="build/MyService.aar" tofile="../../repository/services/sample-MyService.aar" overwrite="true"/>
-        <jar destfile="build/MyServiceWithModule.aar" >
-            <fileset dir="src/userguide/example2/">
-                <include name="META-INF/**"/>
-            </fileset>
-            <fileset dir="${classes.dir}">
-                <include name="userguide/example2/**/*.class"/>
-            </fileset>
-        </jar>
-        <copy file="build/MyServiceWithModule.aar" tofile="../../repository/services/sample-MyServiceWithModule.aar" overwrite="true"/>
-        <jar destfile="build/WsaMappingService.aar">
-            <fileset dir="src/userguide/example3/">
-                <include name="META-INF/**"/>
-            </fileset>
-            <fileset dir="${classes.dir}">
-                <include name="userguide/example3/**/*.class"/>
-            </fileset>
-        </jar>
-        <copy file="build/WsaMappingService.aar" tofile="../../repository/services/sample-WsaMappingService.aar" overwrite="true"/>
-    </target>
-    
-    <target name="generate.module">
-       <jar destfile="build/logging.mar">
-            <fileset dir="src/userguide/loggingmodule/">
-                <include name="META-INF/**"/>
-            </fileset>
-            <fileset dir="${classes.dir}">
-                <include name="userguide/loggingmodule/**/*.class"/>
-            </fileset>
-       </jar>
-       <copy file="build/logging.mar" tofile="../../repository/modules/sample-logging.mar" overwrite="true"/>
-       <echo message="*** Please add the logging phase to the ../../conf/axis2.xml. For more details please refer to the http://ws.apache.org/axis2/1_1/modules.html ***"/>
-    </target>
-
-    <target name="run.client.blocking" depends="compile">
-        <java classname="userguide.clients.EchoBlockingClient"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    <target name="run.client.blockingdual" depends="compile">
-        <java classname="userguide.clients.EchoBlockingDualClient"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    
-    <target name="run.client.nonblocking" depends="compile">
-        <java classname="userguide.clients.EchoNonBlockingClient"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    
-    <target name="run.client.nonblockingdual" depends="compile">
-        <java classname="userguide.clients.EchoNonBlockingDualClient"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    
-    <target name="run.client.ping" depends="compile">
-        <java classname="userguide.clients.PingClient"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    
-    <target name="run.client.servicewithmodule" depends="compile">
-        <java classname="userguide.clients.ClientForWebServiceWithModule"
-              classpathref="axis.classpath" fork="true">
-            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
-        </java>
-    </target>
-    
-    <target name="run.client">
-	<echo message="Please use the following ant targets to run the clients" />
-	<echo message="run.client.ping" />
-	<echo message="run.client.blocking" />
-	<echo message="run.client.blockingdual" />
-	<echo message="run.client.nonblocking" />
-	<echo message="run.client.nonblockingdual" />
-	<echo message="run.client.servicewithmodule" />
-	<echo message="run.client.all  -  run all clients" />
-    </target>
-    <target name="clean">
-	<delete dir="build" />
-    </target>
-</project>
+<project name="samples" default="generate.service">
+    <property name="mainDir" value="../.."/>
+    <property name="classes.dir" value="build/classes"/>
+    <path id="axis.classpath">
+        <fileset dir="../../lib">
+            <include name="*.jar"/>
+        </fileset>
+        <pathelement location="build/userguide.jar"/>
+    </path>
+
+    <target name="run.client.all"
+            depends="run.client.ping,run.client.blocking,run.client.blockingdual,run.client.nonblocking,run.client.nonblockingdual,run.client.servicewithmodule">
+    </target>
+    
+    <target name="compile">
+    		<mkdir dir="${classes.dir}" />
+		<javac srcdir="src" destdir="${classes.dir}">
+			<classpath refid="axis.classpath" />
+		</javac>
+		<jar destfile="build/userguide.jar">
+            		<fileset dir="${classes.dir}">
+                		<include name="userguide/**"/>
+            		</fileset>
+       		</jar>
+    </target>
+    
+    <target name="generate.service" depends="compile">
+            <jar destfile="build/MyService.aar">
+            <fileset dir="src/userguide/example1/">
+                <include name="META-INF/**"/>
+            </fileset>
+            <fileset dir="${classes.dir}">
+                <include name="userguide/example1/**/*.class"/>
+            </fileset>
+        </jar>
+        <copy file="build/MyService.aar" tofile="../../repository/services/sample-MyService.aar" overwrite="true"/>
+        <jar destfile="build/MyServiceWithModule.aar" >
+            <fileset dir="src/userguide/example2/">
+                <include name="META-INF/**"/>
+            </fileset>
+            <fileset dir="${classes.dir}">
+                <include name="userguide/example2/**/*.class"/>
+            </fileset>
+        </jar>
+        <copy file="build/MyServiceWithModule.aar" tofile="../../repository/services/sample-MyServiceWithModule.aar" overwrite="true"/>
+        <jar destfile="build/WsaMappingService.aar">
+            <fileset dir="src/userguide/example3/">
+                <include name="META-INF/**"/>
+            </fileset>
+            <fileset dir="${classes.dir}">
+                <include name="userguide/example3/**/*.class"/>
+            </fileset>
+        </jar>
+        <copy file="build/WsaMappingService.aar" tofile="../../repository/services/sample-WsaMappingService.aar" overwrite="true"/>
+    </target>
+    
+    <target name="generate.module">
+       <jar destfile="build/logging.mar">
+            <fileset dir="src/userguide/loggingmodule/">
+                <include name="META-INF/**"/>
+            </fileset>
+            <fileset dir="${classes.dir}">
+                <include name="userguide/loggingmodule/**/*.class"/>
+            </fileset>
+       </jar>
+       <copy file="build/logging.mar" tofile="../../repository/modules/sample-logging.mar" overwrite="true"/>
+       <echo message="*** Please add the logging phase to the ../../conf/axis2.xml. For more details please refer to the http://ws.apache.org/axis2/1_1/modules.html ***"/>
+    </target>
+
+    <target name="run.client.blocking" depends="compile">
+        <java classname="userguide.clients.EchoBlockingClient"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    <target name="run.client.blockingdual" depends="compile">
+        <java classname="userguide.clients.EchoBlockingDualClient"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    
+    <target name="run.client.nonblocking" depends="compile">
+        <java classname="userguide.clients.EchoNonBlockingClient"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    
+    <target name="run.client.nonblockingdual" depends="compile">
+        <java classname="userguide.clients.EchoNonBlockingDualClient"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    
+    <target name="run.client.ping" depends="compile">
+        <java classname="userguide.clients.PingClient"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    
+    <target name="run.client.servicewithmodule" depends="compile">
+        <java classname="userguide.clients.ClientForWebServiceWithModule"
+              classpathref="axis.classpath" fork="true">
+            <jvmarg value="-Daxis2.repo=${mainDir}/repository"/>
+        </java>
+    </target>
+    
+    <target name="run.client">
+	<echo message="Please use the following ant targets to run the clients" />
+	<echo message="run.client.ping" />
+	<echo message="run.client.blocking" />
+	<echo message="run.client.blockingdual" />
+	<echo message="run.client.nonblocking" />
+	<echo message="run.client.nonblockingdual" />
+	<echo message="run.client.servicewithmodule" />
+	<echo message="run.client.all  -  run all clients" />
+    </target>
+    <target name="clean">
+	<delete dir="build" />
+    </target>
+</project>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/userguide/src/userguide/example3/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/userguide/src/userguide/example3/META-INF/services.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/userguide/src/userguide/example3/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/userguide/src/userguide/example3/META-INF/services.xml Wed Nov 15 10:15:56 2006
@@ -1,13 +1,13 @@
-<serviceGroup>
-    <service name="WsaMappingTest">
-        <description>
-            Sample to via WSA Mapping
-        </description>
-        <parameter name="ServiceClass" locked="false">userguide.example3.MyService</parameter>
-        <operation name="echo">
-            <messageReceiver
-                    class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
-            <actionMapping>urn:sample/echo</actionMapping>
-        </operation>
-    </service>
+<serviceGroup>
+    <service name="WsaMappingTest">
+        <description>
+            Sample to via WSA Mapping
+        </description>
+        <parameter name="ServiceClass" locked="false">userguide.example3.MyService</parameter>
+        <operation name="echo">
+            <messageReceiver
+                    class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+            <actionMapping>urn:sample/echo</actionMapping>
+        </operation>
+    </service>
 </serviceGroup>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/version/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/version/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/version/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/version/build.xml Wed Nov 15 10:15:56 2006
@@ -1,46 +1,46 @@
-
-<project basedir="." default="generate.service">
-	
-	<property name="dest.dir" value="build" />
-	
-	<property name="dest.dir.classes" value="${dest.dir}/classes" />
-	
-	<property name="axis2.home" value="../../" />
-	
-	<property name="repository.path" value="${axis2.home}/repository/services" />
-	
-	<path id="build.class.path">
-		<fileset dir="${axis2.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-	
-	<target name="clean">
-		<delete dir="${dest.dir}" />
-	</target>
-	
-	<target name="prepare">
-		
-		<mkdir dir="${dest.dir}" />
-		
-		<mkdir dir="${dest.dir.classes}" />
-		
-		<mkdir dir="${dest.dir.classes}/META-INF" />
-	
-	</target>
-	
-	<target name="generate.service" depends="clean,prepare">
-		
-		<copy file="src/sample/axisversion/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
-		
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/axisversion/**">
-			<classpath refid="build.class.path" />
-		</javac>
-		
-		<jar basedir="${dest.dir.classes}" destfile="${dest.dir}/version.aar" />
-		
-		<copy file="${dest.dir}/version.aar" tofile="${repository.path}/version.aar" overwrite="true" />
-	
-	</target>
-	
-</project>
+
+<project basedir="." default="generate.service">
+	
+	<property name="dest.dir" value="build" />
+	
+	<property name="dest.dir.classes" value="${dest.dir}/classes" />
+	
+	<property name="axis2.home" value="../../" />
+	
+	<property name="repository.path" value="${axis2.home}/repository/services" />
+	
+	<path id="build.class.path">
+		<fileset dir="${axis2.home}/lib">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
+	<target name="clean">
+		<delete dir="${dest.dir}" />
+	</target>
+	
+	<target name="prepare">
+		
+		<mkdir dir="${dest.dir}" />
+		
+		<mkdir dir="${dest.dir.classes}" />
+		
+		<mkdir dir="${dest.dir.classes}/META-INF" />
+	
+	</target>
+	
+	<target name="generate.service" depends="clean,prepare">
+		
+		<copy file="src/sample/axisversion/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
+		
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/axisversion/**">
+			<classpath refid="build.class.path" />
+		</javac>
+		
+		<jar basedir="${dest.dir.classes}" destfile="${dest.dir}/version.aar" />
+		
+		<copy file="${dest.dir}/version.aar" tofile="${repository.path}/version.aar" overwrite="true" />
+	
+	</target>
+	
+</project>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/version/src/sample/axisversion/META-INF/services.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/version/src/sample/axisversion/META-INF/services.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/version/src/sample/axisversion/META-INF/services.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/version/src/sample/axisversion/META-INF/services.xml Wed Nov 15 10:15:56 2006
@@ -1,9 +1,9 @@
-<service name="Version">
-    <description>
-        This service is to get the running Axis version
-    </description>
-    <parameter name="ServiceClass" locked="false">sample.axisversion.Version</parameter>
-    <operation name="getVersion">
-    <messageReceiver  class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
-    </operation>
+<service name="Version">
+    <description>
+        This service is to get the running Axis version
+    </description>
+    <parameter name="ServiceClass" locked="false">sample.axisversion.Version</parameter>
+    <operation name="getVersion">
+    <messageReceiver  class="org.apache.axis2.rpc.receivers.RPCMessageReceiver" />
+    </operation>
 </service>

Modified: webservices/axis2/branches/java/new-trunk/modules/samples/yahoorestsearch/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/samples/yahoorestsearch/build.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/samples/yahoorestsearch/build.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/samples/yahoorestsearch/build.xml Wed Nov 15 10:15:56 2006
@@ -1,32 +1,32 @@
-<project name="YahooRestSearchSample" default="run.client">
-	<property environment="env" />
-	<property name="axis2.home" value="../../" />
-	<property name="axis2.repo" value="${axis2.home}/repository" />
-	<property name="build.dir" value="build" />
-	<property name="client.classes.dir" value="${build.dir}/classes" />
-	<path id="axis.classpath">
-		<fileset dir="${axis2.home}/lib">
-			<include name="*.jar" />
-		</fileset>
-		<pathelement location="build/yahooRESTSearch.jar" />
-	</path>
-
-	<target name="compile">
-		<mkdir dir="${client.classes.dir}" />
-		<!-- Compile client -->
-		<javac srcdir="src" destdir="${client.classes.dir}">
-			<classpath refid="axis.classpath" />
-		</javac>
-		<jar destfile="${build.dir}/yahooRESTSearch.jar">
-			<fileset dir="${build.dir}/classes" />
-		</jar>
-	</target>
-	<target name="run.client" depends="compile">
-		<java classname="sample.yahooservices.RESTSearch.RESTSearchClient" classpathref="axis.classpath" fork="true">
-			<jvmarg value="-Daxis2.repo=${axis2.repo}" />
-		</java>
-	</target>
-	<target name="clean">
-		<delete dir="build" />
-	</target>
-</project>
+<project name="YahooRestSearchSample" default="run.client">
+	<property environment="env" />
+	<property name="axis2.home" value="../../" />
+	<property name="axis2.repo" value="${axis2.home}/repository" />
+	<property name="build.dir" value="build" />
+	<property name="client.classes.dir" value="${build.dir}/classes" />
+	<path id="axis.classpath">
+		<fileset dir="${axis2.home}/lib">
+			<include name="*.jar" />
+		</fileset>
+		<pathelement location="build/yahooRESTSearch.jar" />
+	</path>
+
+	<target name="compile">
+		<mkdir dir="${client.classes.dir}" />
+		<!-- Compile client -->
+		<javac srcdir="src" destdir="${client.classes.dir}">
+			<classpath refid="axis.classpath" />
+		</javac>
+		<jar destfile="${build.dir}/yahooRESTSearch.jar">
+			<fileset dir="${build.dir}/classes" />
+		</jar>
+	</target>
+	<target name="run.client" depends="compile">
+		<java classname="sample.yahooservices.RESTSearch.RESTSearchClient" classpathref="axis.classpath" fork="true">
+			<jvmarg value="-Daxis2.repo=${axis2.repo}" />
+		</java>
+	</target>
+	<target name="clean">
+		<delete dir="build" />
+	</target>
+</project>

Modified: webservices/axis2/branches/java/new-trunk/modules/savan/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/savan/project.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/savan/project.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/savan/project.xml Wed Nov 15 10:15:56 2006
@@ -118,14 +118,14 @@
             <properties>
                 <module>true</module>
             </properties>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javamail.version}</version>
-            <properties>
-                <module>true</module>
-            </properties>
+        </dependency>
+        <dependency>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+            <version>${javamail.version}</version>
+            <properties>
+                <module>true</module>
+            </properties>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>

Modified: webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-asymm-binding.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-asymm-binding.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-asymm-binding.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-asymm-binding.xml Wed Nov 15 10:15:56 2006
@@ -1,46 +1,46 @@
-<wsp:Policy wsu:Id="1" 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:Basic256/>
-						</wsp:Policy>
-					</sp:AlgorithmSuite>
-					<sp:Layout>
-						<wsp:Policy>
-							<sp:Lax/>
-						</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>
-		</wsp:All>
-	</wsp:ExactlyOne>
-</wsp:Policy>
+<wsp:Policy wsu:Id="1" 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:Basic256/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</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>
+		</wsp:All>
+	</wsp:ExactlyOne>
+</wsp:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-symm-binding.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-symm-binding.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-symm-binding.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-symm-binding.xml Wed Nov 15 10:15:56 2006
@@ -1,53 +1,53 @@
-<wsp:Policy wsu:Id="3" 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: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:Basic256/>
-						</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 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<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 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-				<wsp:Policy>
-					<sp:MustSupportRefKeyIdentifier/>
-					<sp:MustSupportRefIssuerSerial/>
-					<sp:MustSupportRefThumbprint/>
-					<sp:MustSupportRefEncryptedKey/>
-					<sp:RequireSignatureConfirmation/>
-				</wsp:Policy>
-			</sp:Wss11>
-		</wsp:All>
-	</wsp:ExactlyOne>
-</wsp:Policy>
+<wsp:Policy wsu:Id="3" 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: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:Basic256/>
+						</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 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<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 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<wsp:Policy>
+					<sp:MustSupportRefKeyIdentifier/>
+					<sp:MustSupportRefIssuerSerial/>
+					<sp:MustSupportRefThumbprint/>
+					<sp:MustSupportRefEncryptedKey/>
+					<sp:RequireSignatureConfirmation/>
+				</wsp:Policy>
+			</sp:Wss11>
+		</wsp:All>
+	</wsp:ExactlyOne>
+</wsp:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-transport-binding.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-transport-binding.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-transport-binding.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/secpolicy/test-resources/policy-transport-binding.xml Wed Nov 15 10:15:56 2006
@@ -1,43 +1,43 @@
-<wsp:Policy wsu:Id="2" 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:WssUsernameToken10/>
-						</wsp:Policy>
-					</sp:UsernameToken>
-				</wsp:Policy>
-			</sp:SignedSupportingTokens>
-			<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>
-		</wsp:All>
-	</wsp:ExactlyOne>
-</wsp:Policy>
+<wsp:Policy wsu:Id="2" 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:WssUsernameToken10/>
+						</wsp:Policy>
+					</sp:UsernameToken>
+				</wsp:Policy>
+			</sp:SignedSupportingTokens>
+			<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>
+		</wsp:All>
+	</wsp:ExactlyOne>
+</wsp:Policy>

Modified: webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindings.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindings.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindings.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindings.xml Wed Nov 15 10:15:56 2006
@@ -1,50 +1,50 @@
-
-<!-- Example Endpoint Policy --> 
-<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
-            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-<sp:AsymmetricBinding>
- <wsp:Policy>
- <sp:RecipientToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always" />
- </wsp:Policy> </sp:RecipientToken>
- <sp:InitiatorToken>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always" />
- </wsp:Policy>
- </sp:InitiatorToken>
- <sp:AlgorithmSuite>
- <wsp:Policy>
- <sp:Basic256 />
- </wsp:Policy>
- </sp:AlgorithmSuite>
- <sp:Layout>
- <wsp:Policy>
- <sp:Strict />
- </wsp:Policy>
- </sp:Layout>
- <sp:IncludeTimestamp />
- <sp:EncryptBeforeSigning />
- <sp:EncryptSignature />
- <sp:ProtectTokens />
- <sp:SignedSupportingTokens>
- <wsp:Policy>
- <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
- </wsp:Policy>
- </sp:SignedSupportingTokens>
- <sp:SignedEndorsingSupportingTokens>
- <wsp:Policy>
- <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
- </wsp:Policy>
- </sp:SignedEndorsingSupportingTokens>
- </wsp:Policy> 
- </sp:AsymmetricBinding>
- <sp:Wss11> 
- <wsp:Policy>
- <sp:RequireSignatureConfirmation />
- </wsp:Policy>
- </sp:Wss11>
- </wsp:Policy>
-
+
+<!-- Example Endpoint Policy --> 
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+<sp:AsymmetricBinding>
+ <wsp:Policy>
+ <sp:RecipientToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always" />
+ </wsp:Policy> </sp:RecipientToken>
+ <sp:InitiatorToken>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always" />
+ </wsp:Policy>
+ </sp:InitiatorToken>
+ <sp:AlgorithmSuite>
+ <wsp:Policy>
+ <sp:Basic256 />
+ </wsp:Policy>
+ </sp:AlgorithmSuite>
+ <sp:Layout>
+ <wsp:Policy>
+ <sp:Strict />
+ </wsp:Policy>
+ </sp:Layout>
+ <sp:IncludeTimestamp />
+ <sp:EncryptBeforeSigning />
+ <sp:EncryptSignature />
+ <sp:ProtectTokens />
+ <sp:SignedSupportingTokens>
+ <wsp:Policy>
+ <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
+ </wsp:Policy>
+ </sp:SignedSupportingTokens>
+ <sp:SignedEndorsingSupportingTokens>
+ <wsp:Policy>
+ <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
+ </wsp:Policy>
+ </sp:SignedEndorsingSupportingTokens>
+ </wsp:Policy> 
+ </sp:AsymmetricBinding>
+ <sp:Wss11> 
+ <wsp:Policy>
+ <sp:RequireSignatureConfirmation />
+ </wsp:Policy>
+ </sp:Wss11>
+ </wsp:Policy>
+
  

Modified: webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindingsSymm.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindingsSymm.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindingsSymm.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyBindingsSymm.xml Wed Nov 15 10:15:56 2006
@@ -4,9 +4,9 @@
             xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
 <sp:SymmetricBinding>
 <wsp:Policy>
-<sp:ProtectionToken>
+<sp:ProtectionToken>
 <wsp:Policy>
-<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
+<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always"/>
 </wsp:Policy>
 </sp:ProtectionToken>
 <sp:AlgorithmSuite>

Modified: webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyMsg.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyMsg.xml?view=diff&rev=475341&r1=475340&r2=475341
==============================================================================
--- webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyMsg.xml (original)
+++ webservices/axis2/branches/java/new-trunk/modules/security/test-resources/policy/SecurityPolicyMsg.xml Wed Nov 15 10:15:56 2006
@@ -1,19 +1,19 @@
-<!-- Example Endpoint Policy --> 
-<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
-            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
-
- <!-- Example Message Policy -->
-
- <sp:SignedParts>
-   <sp:Header Name="Header1" Namespace="uri:namespace_1" />
-   <sp:Header Name="Header2" Namespace="uri:namespace_2" /> 
-   <sp:Body/>
- </sp:SignedParts>
- <sp:EncryptedParts>
-   <sp:Header Name="Header2" Namespace="uri:namespace_2" />
-   <sp:Body/>
- </sp:EncryptedParts>
-
- </wsp:Policy>
+<!-- Example Endpoint Policy --> 
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+            xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+
+ <!-- Example Message Policy -->
+
+ <sp:SignedParts>
+   <sp:Header Name="Header1" Namespace="uri:namespace_1" />
+   <sp:Header Name="Header2" Namespace="uri:namespace_2" /> 
+   <sp:Body/>
+ </sp:SignedParts>
+ <sp:EncryptedParts>
+   <sp:Header Name="Header2" Namespace="uri:namespace_2" />
+   <sp:Body/>
+ </sp:EncryptedParts>
+
+ </wsp:Policy>
  



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message