You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/30 17:08:20 UTC

svn commit: r1780946 [3/5] - in /axis/axis2/java/rampart/branches/RAMPART-289: ./ modules/distribution/ modules/documentation/src/site/ modules/documentation/src/site/resources/ modules/documentation/src/site/resources/css/ modules/documentation/src/si...

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-10.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-10.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-10.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-10.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-13.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-13.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-13.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-13.xml Mon Jan 30 17:08:19 2017
@@ -27,7 +27,7 @@
 			</sp:TransportToken>
 			<sp:AlgorithmSuite>
 			  <wsp:Policy>
-				<sp:Basic256/>
+				<sp:Basic128/>
 			  </wsp:Policy>
 			</sp:AlgorithmSuite>
 			<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-14.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-14.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-14.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-14.xml Mon Jan 30 17:08:19 2017
@@ -35,7 +35,7 @@
 	                        </sp:ProtectionToken>
 	                        <sp:AlgorithmSuite>
 	                            <wsp:Policy>
-	                                <sp:Basic256/>
+	                                <sp:Basic128/>
 	                            </wsp:Policy>
 	                        </sp:AlgorithmSuite>
 	                        <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-15.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-15.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-15.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-15.xml Mon Jan 30 17:08:19 2017
@@ -36,7 +36,7 @@
 						</sp:ProtectionToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256/>
+								<sp:Basic128/>
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-17.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-17.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-17.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-17.xml Mon Jan 30 17:08:19 2017
@@ -36,7 +36,7 @@
 	                    </sp:ProtectionToken>
 	                    <sp:AlgorithmSuite>
 	                        <wsp:Policy>
-	                            <sp:Basic256/>
+	                            <sp:Basic128/>
 	                        </wsp:Policy>
 	                    </sp:AlgorithmSuite>
 	                    <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-18.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-18.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-18.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-18.xml Mon Jan 30 17:08:19 2017
@@ -36,7 +36,7 @@
 	                    </sp:ProtectionToken>
 	                    <sp:AlgorithmSuite>
 	                        <wsp:Policy>
-	                            <sp:Basic256/>
+	                            <sp:Basic128/>
 	                        </wsp:Policy>
 	                    </sp:AlgorithmSuite>
 	                    <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-19.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-19.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-19.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-19.xml Mon Jan 30 17:08:19 2017
@@ -36,7 +36,7 @@
 	                    </sp:ProtectionToken>
 	                    <sp:AlgorithmSuite>
 	                        <wsp:Policy>
-	                            <sp:Basic256/>
+	                            <sp:Basic128/>
 	                        </wsp:Policy>
 	                    </sp:AlgorithmSuite>
 	                    <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-2.xml Mon Jan 30 17:08:19 2017
@@ -44,7 +44,7 @@
                         </sp:RecipientToken>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>
-                                <sp:Basic256/>
+                                <sp:Basic128/>
                             </wsp:Policy>
                         </sp:AlgorithmSuite>
                         <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-20.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-20.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-20.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-20.xml Mon Jan 30 17:08:19 2017
@@ -36,7 +36,7 @@
 	                    </sp:ProtectionToken>
 	                    <sp:AlgorithmSuite>
 	                        <wsp:Policy>
-	                            <sp:Basic256/>
+	                            <sp:Basic128/>
 	                        </wsp:Policy>
 	                    </sp:AlgorithmSuite>
 	                    <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-21.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-21.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-21.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-21.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-22.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-22.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-22.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-22.xml Mon Jan 30 17:08:19 2017
@@ -37,7 +37,7 @@
                         </sp:ProtectionToken>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>
-                                <sp:Basic256/>
+                                <sp:Basic128/>
                             </wsp:Policy>
                         </sp:AlgorithmSuite>
                         <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-23.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-23.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-23.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-23.xml Mon Jan 30 17:08:19 2017
@@ -32,7 +32,7 @@
                         </sp:ProtectionToken>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>
-                                <sp:Basic256/>
+                                <sp:Basic128/>
                             </wsp:Policy>
                         </sp:AlgorithmSuite>
                         <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-24.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-24.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-24.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-24.xml Mon Jan 30 17:08:19 2017
@@ -32,7 +32,7 @@
                         </sp:ProtectionToken>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>
-                                <sp:Basic256/>
+                                <sp:Basic128/>
                             </wsp:Policy>
                         </sp:AlgorithmSuite>
                         <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-25.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-25.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-25.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-25.xml Mon Jan 30 17:08:19 2017
@@ -32,7 +32,7 @@
                         </sp:ProtectionToken>
                         <sp:AlgorithmSuite>
                             <wsp:Policy>
-                                <sp:Basic256/>
+                                <sp:Basic128/>
                             </wsp:Policy>
                         </sp:AlgorithmSuite>
                         <sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-26.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-26.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-26.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-26.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-27.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-27.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-27.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-27.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-28.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-28.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-28.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-28.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-3.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-3.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-3.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-3.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 						</sp:RecipientToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256/>
+								<sp:Basic128/>
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-4.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-4.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-4.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-4.xml Mon Jan 30 17:08:19 2017
@@ -40,7 +40,7 @@
 					</sp:RecipientToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-5.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-5.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-5.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-5.xml Mon Jan 30 17:08:19 2017
@@ -42,7 +42,7 @@
 						</sp:RecipientToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic256/>
+								<sp:Basic128/>
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml Mon Jan 30 17:08:19 2017
@@ -81,7 +81,7 @@
 					</sp:ProtectionToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-3.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-3.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-3.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-3.xml Mon Jan 30 17:08:19 2017
@@ -32,7 +32,7 @@
 												</sp:TransportToken>
 												<sp:AlgorithmSuite>
 												  <wsp:Policy>
-													<sp:Basic256/>
+													<sp:Basic128/>
 												  </wsp:Policy>
 												</sp:AlgorithmSuite>
 												<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -32,15 +32,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -24,15 +24,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -23,15 +23,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.0</parameter>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml Mon Jan 30 17:08:19 2017
@@ -24,15 +24,10 @@
           <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
-    </transportReceiver>
-
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>

Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-mar/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1,3 @@
+.settings
+target
+.project

Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java Mon Jan 30 17:08:19 2017
@@ -25,7 +25,7 @@ public abstract class AbstractSecurityAs
 
     private boolean isOptional;
     
-    private boolean normalized = false; 
+    private boolean normalized = true; 
     
     protected int version;
 
@@ -50,7 +50,7 @@ public abstract class AbstractSecurityAs
     }
     
     public boolean isNormalized() {
-        return true;
+        return this.normalized;
     }
 
     public PolicyComponent normalize() {

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java Mon Jan 30 17:08:19 2017
@@ -122,9 +122,9 @@ public class SignedEncryptedElements ext
             Iterator<String> namespaces = declaredNamespaces.keySet().iterator();
 
             while(namespaces.hasNext()) {
-                prefix = (String) namespaces.next();
-                namespaceURI = (String) declaredNamespaces.get(prefix);
-                writer.writeNamespace(prefix,namespaceURI);
+            	final String declaredPrefix = namespaces.next();
+            	final String declaredNamespaceURI = (String) declaredNamespaces.get(declaredPrefix);
+                writer.writeNamespace(declaredPrefix,declaredNamespaceURI); 
             }
 
             writer.writeCharacters(xpathExpression);

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java Mon Jan 30 17:08:19 2017
@@ -37,6 +37,16 @@ public class SignedEncryptedParts extend
     private ArrayList headers = new ArrayList();
     
     private boolean signedParts;
+
+    private boolean signAllHeaders;
+
+    public boolean isSignAllHeaders() {
+        return signAllHeaders;
+    }
+
+    public void setSignAllHeaders(boolean signAllHeaders) {
+        this.signAllHeaders = signAllHeaders;
+    }
     
     public SignedEncryptedParts(boolean signedParts, int version) {
         this.signedParts = signedParts;

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java Mon Jan 30 17:08:19 2017
@@ -37,9 +37,12 @@ public class TransportBinding extends Bi
     private TransportToken transportToken;
 
     private List transportBindings;
+    
+    private boolean tokenProtection;
 
     public TransportBinding(int version) {
         super(version);
+        this.tokenProtection = false;
     }
     /**
      * @return Returns the transportToken.
@@ -55,6 +58,21 @@ public class TransportBinding extends Bi
     public void setTransportToken(TransportToken transportToken) {
         this.transportToken = transportToken;
     }
+    
+    /**
+     * @return Returns the tokenProtection.
+     */
+    public boolean isTokenProtection() {
+        return tokenProtection;
+    }
+
+    /**
+     * @param tokenProtection The tokenProtection to set.
+     */
+    public void setTokenProtection(boolean tokenProtection) {
+        this.tokenProtection = tokenProtection;
+    }
+    
 
     public List getConfigurations() {
         return transportBindings;

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java Mon Jan 30 17:08:19 2017
@@ -42,8 +42,8 @@ public class EncryptedElementsBuilder im
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedElements.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
         
         for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java Mon Jan 30 17:08:19 2017
@@ -52,8 +52,8 @@ public class EncryptedPartsBuilder imple
 		 OMAttribute isOptional = element
 				.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedParts.setOptional((new Boolean(isOptional
-					.getAttributeValue()).booleanValue()));
+			signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
+					.getAttributeValue()).booleanValue());
 		}
         
         return signedEncryptedParts;

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java Mon Jan 30 17:08:19 2017
@@ -43,8 +43,8 @@ public class SignedElementsBuilder imple
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedElements.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
         
         for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java Mon Jan 30 17:08:19 2017
@@ -36,13 +36,19 @@ public class SignedPartsBuilder implemen
         SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(true, SPConstants.SP_V11);
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedParts.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
         for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {
             processElement((OMElement) iterator.next(), signedEncryptedParts);
         }
-        
+
+        // Presense of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
+        if(!element.getChildren().hasNext()){
+            signedEncryptedParts.setBody(true);
+            signedEncryptedParts.setSignAllHeaders(true);
+        }
+
         return signedEncryptedParts;
     }
        

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java Mon Jan 30 17:08:19 2017
@@ -55,8 +55,8 @@ public class SupportingTokensBuilder imp
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			supportingToken.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
    
         Policy policy = PolicyEngine.getPolicy(element.getFirstElement());

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java Mon Jan 30 17:08:19 2017
@@ -47,8 +47,8 @@ public class UsernameTokenBuilder implem
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			usernameToken.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		} 
         
         OMElement policyElement = element.getFirstElement();

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java Mon Jan 30 17:08:19 2017
@@ -63,8 +63,8 @@ public class X509TokenBuilder implements
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			x509Token.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
    
 

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java Mon Jan 30 17:08:19 2017
@@ -47,8 +47,8 @@ public class EncryptedElementsBuilder im
     	OMAttribute isOptional = element
 				.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedElements.setOptional((new Boolean(isOptional
-					.getAttributeValue()).booleanValue()));
+			signedEncryptedElements.setOptional(Boolean.valueOf(isOptional
+					.getAttributeValue()).booleanValue());
 		}
         
         return signedEncryptedElements;

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java Mon Jan 30 17:08:19 2017
@@ -52,8 +52,8 @@ public class EncryptedPartsBuilder imple
 		OMAttribute isOptional = element
 				.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedParts.setOptional((new Boolean(isOptional
-					.getAttributeValue()).booleanValue()));
+			signedEncryptedParts.setOptional(Boolean.valueOf(isOptional
+					.getAttributeValue()).booleanValue());
 		}
         
         return signedEncryptedParts;

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java Mon Jan 30 17:08:19 2017
@@ -44,8 +44,8 @@ public class SignedElementsBuilder imple
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedElements.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			signedEncryptedElements.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
         
         for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java Mon Jan 30 17:08:19 2017
@@ -41,9 +41,15 @@ public class SignedPartsBuilder implemen
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			signedEncryptedParts.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			signedEncryptedParts.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
+
+        //presense of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
+        if(!element.getChildren().hasNext()){
+            signedEncryptedParts.setBody(true);
+            signedEncryptedParts.setSignAllHeaders(true);
+        }
         
         return signedEncryptedParts;
     }

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java Mon Jan 30 17:08:19 2017
@@ -71,8 +71,8 @@ public class SupportingTokensBuilder imp
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			supportingToken.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			supportingToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
 
         Policy policy = PolicyEngine.getPolicy(element.getFirstElement());

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java Mon Jan 30 17:08:19 2017
@@ -77,6 +77,9 @@ public class TransportBindingBuilder imp
             } else if (name.equals(SP12Constants.LAYOUT)) {
                 parent.setLayout((Layout) primitive);
                  
+            } else if (name.equals(SP12Constants.PROTECT_TOKENS)) {
+                parent.setTokenProtection(true);
+                 
             } else if (name.equals(SP12Constants.SIGNED_SUPPORTING_TOKENS)) {
                 parent.setSignedSupportingToken((SupportingToken) primitive);
                 

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java Mon Jan 30 17:08:19 2017
@@ -47,8 +47,8 @@ public class UsernameTokenBuilder implem
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			usernameToken.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			usernameToken.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
         
         OMElement policyElement = element.getFirstElement();

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java Mon Jan 30 17:08:19 2017
@@ -62,8 +62,8 @@ public class X509TokenBuilder implements
         
         OMAttribute isOptional = element.getAttribute(Constants.Q_ELEM_OPTIONAL_ATTR);
 		if (isOptional != null) {
-			x509Token.setOptional((new Boolean(isOptional.getAttributeValue())
-					.booleanValue()));
+			x509Token.setOptional(Boolean.valueOf(isOptional.getAttributeValue())
+					.booleanValue());
 		}
 
         if (policyElement != null) {

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt Mon Jan 30 17:08:19 2017
@@ -15,3 +15,7 @@ Please use Apache Ant with the build.xml
 and mars to required places.
 
     - Please copy log4j.jar to AXIS2_HOME/lib directory before trying out samples.
+
+    - Please follow the instructions on endorsing the default JAXP implementation
+      available in README.txt of this distribution before invoking 
+      Sample 08.(Issuing a SAML 2.0 Token)

Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/basic/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1 @@
+build

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/client.jks
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/client.jks?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
Binary files - no diff available.

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/service.jks
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/service.jks?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
Binary files - no diff available.

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/sts.jks
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/sts.jks?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
Binary files - no diff available.

Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1 @@
+build

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml Mon Jan 30 17:08:19 2017
@@ -109,6 +109,17 @@
         <create.and.run.client sample.number="07"/>
     </target>
 
+    <!-- Sample Service 08 -->
+    <target name="service.08" if="env.AXIS2_HOME" depends="check.dependency">
+        <create.service.repo sample.number="08"/>
+    </target>
+
+    <!-- Sample Client 08 -->
+    <target name="client.08" if="env.AXIS2_HOME" depends="check.dependency">
+        <create.and.run.client sample.number="08"/>
+    </target>
+
+
 	<target name="clean">
 		<delete dir="build" />
 	</target>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/policy.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/policy.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/policy.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/policy.xml Mon Jan 30 17:08:19 2017
@@ -11,7 +11,7 @@
 			</sp:TransportToken>
 			<sp:AlgorithmSuite>
 			  <wsp:Policy>
-				<sp:Basic256/>
+				<sp:Basic128/>
 			  </wsp:Policy>
 			</sp:AlgorithmSuite>
 			<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/services.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/services.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/services.xml Mon Jan 30 17:08:19 2017
@@ -37,7 +37,7 @@
 				</sp:TransportToken>
 				<sp:AlgorithmSuite>
 				  <wsp:Policy>
-					<sp:Basic256/>
+					<sp:Basic128/>
 				  </wsp:Policy>
 				</sp:AlgorithmSuite>
 				<sp:Layout>
@@ -55,7 +55,7 @@
 			</sp:SignedSupportingTokens>
 			
 			<ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
-				<ramp:passwordCallbackClass>org.apache.rampart.tomcat.sample.PWCBHandler</ramp:passwordCallbackClass>
+				<ramp:passwordCallbackClass>org.apache.rampart.tomcat.sample.PWCBHandler</ramp:passwordCallbackClass>
 			</ramp:RampartConfig>
 			
 		  </wsp:All>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/policy.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/policy.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/policy.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/policy.xml Mon Jan 30 17:08:19 2017
@@ -27,7 +27,7 @@
 			</sp:TransportToken>
 			<sp:AlgorithmSuite>
 			  <wsp:Policy>
-				<sp:Basic256/>
+				<sp:Basic128/>
 			  </wsp:Policy>
 			</sp:AlgorithmSuite>
 			<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml Mon Jan 30 17:08:19 2017
@@ -37,7 +37,7 @@
 				</sp:TransportToken>
 				<sp:AlgorithmSuite>
 				  <wsp:Policy>
-					<sp:Basic256/>
+					<sp:Basic128/>
 				  </wsp:Policy>
 				</sp:AlgorithmSuite>
 				<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/policy.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/policy.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/policy.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/policy.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
 					</sp:ProtectionToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/services.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/services.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/services.xml Mon Jan 30 17:08:19 2017
@@ -16,11 +16,11 @@
  ! limitations under the License.
  !-->
 <!-- services.xml of Sample05 : WS Trust -->
-<serviceGroup>
+<serviceGroup>
 <service name="STS">	
 	<module ref="rampart" />
-	<module ref="addressing" />
-	<module ref="rahas" />
+	<module ref="addressing" />
+	<module ref="rahas" />
 	<parameter name="saml-issuer-config">
 		<saml-issuer-config>
 			<issuerName>SAMPLE_STS</issuerName>
@@ -53,7 +53,7 @@
                Valid values are: EncryptedKey & BinarySecret
             -->
             		<proofKeyType>BinarySecret</proofKeyType>
-            <trusted-services>
+            <trusted-services>
 				<service alias="service">*</service>
             </trusted-services>
 		</saml-issuer-config>
@@ -68,7 +68,7 @@
 							<wsp:Policy>
 								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
 									<wsp:Policy>
-										<sp:RequireThumbprintReference/>
+										<sp:RequireThumbprintReference/>
 										<sp:WssX509V3Token10/>
 									</wsp:Policy>
 								</sp:X509Token>
@@ -78,7 +78,7 @@
 							<wsp:Policy>
 								<sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
 									<wsp:Policy>
-										<sp:RequireThumbprintReference/>
+										<sp:RequireThumbprintReference/>
 										<sp:WssX509V3Token10/>
 									</wsp:Policy>
 								</sp:X509Token>
@@ -119,113 +119,113 @@
 							<ramp:property name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
 							<ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">apache</ramp:property>
 						</ramp:crypto>
-					</ramp:signatureCrypto>
-
+					</ramp:signatureCrypto>
+
 
 		</ramp:RampartConfig>
 	
 		  </wsp:All>
 		</wsp:ExactlyOne>
-	</wsp:Policy>
+	</wsp:Policy>
+
 
+</service>
+<service name="sample05">
+	<operation name="echo">
+		<messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+	</operation>    
+	<parameter name="ServiceClass" locked="false">org.apache.rampart.samples.policy.sample05.SimpleService</parameter>
+	
+	<module ref="rampart" />
+	<module ref="addressing" />
+	
+	<wsp:Policy wsu:Id="SgnOnlyAnonymous"
+		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"
+		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+		xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<wsp:ExactlyOne>
+		<wsp:All>
+			<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:RequireThumbprintReference/>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:ProtectionToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic128/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:SymmetricBinding>
+			<sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+					<wsp:Policy>
+						<sp:IssuedToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+							<Issuer xmlns="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+								<Address xmlns="http://www.w3.org/2005/08/addressing">https://kirillgdev04/Security_Federation_SecurityTokenService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport</Address>
+							</Issuer>
+							<sp:RequestSecurityTokenTemplate>
+								<t:TokenType xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">urn:oasis:names:tc:SAML:1.0:assertion</t:TokenType>
+								<t:KeyType xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">http://schemas.xmlsoap.org/ws/2005/02/trust/SymmetricKey</t:KeyType>
+								<t:KeySize xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">256</t:KeySize>
+							</sp:RequestSecurityTokenTemplate>
+							<wsp:Policy>
+								<sp:RequireInternalReference/>
+							</wsp:Policy>
+						</sp:IssuedToken>
+					</wsp:Policy>
+		     </sp:SupportingTokens>
+			<sp:SignedParts>
+				<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
+				<sp:Body/>
+			</sp:SignedParts>
+			<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>
+				<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.sample05.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">service.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>
+	
 
-</service>
-<service name="sample05">
-	<operation name="echo">
-		<messageReceiver class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
-	</operation>    
-	<parameter name="ServiceClass" locked="false">org.apache.rampart.samples.policy.sample05.SimpleService</parameter>
-	
-	<module ref="rampart" />
-	<module ref="addressing" />
-	
-	<wsp:Policy wsu:Id="SgnOnlyAnonymous"
-		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"
-		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
-		xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-	<wsp:ExactlyOne>
-		<wsp:All>
-			<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: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:Lax/>
-						</wsp:Policy>
-					</sp:Layout>
-					<sp:IncludeTimestamp/>
-					<sp:OnlySignEntireHeadersAndBody/>
-				</wsp:Policy>
-			</sp:SymmetricBinding>
-			<sp:SupportingTokens xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-					<wsp:Policy>
-						<sp:IssuedToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-							<Issuer xmlns="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-								<Address xmlns="http://www.w3.org/2005/08/addressing">https://kirillgdev04/Security_Federation_SecurityTokenService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport</Address>
-							</Issuer>
-							<sp:RequestSecurityTokenTemplate>
-								<t:TokenType xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">urn:oasis:names:tc:SAML:1.0:assertion</t:TokenType>
-								<t:KeyType xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">http://schemas.xmlsoap.org/ws/2005/02/trust/SymmetricKey</t:KeyType>
-								<t:KeySize xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust">256</t:KeySize>
-							</sp:RequestSecurityTokenTemplate>
-							<wsp:Policy>
-								<sp:RequireInternalReference/>
-							</wsp:Policy>
-						</sp:IssuedToken>
-					</wsp:Policy>
-		     </sp:SupportingTokens>
-			<sp:SignedParts>
-				<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
-				<sp:Body/>
-			</sp:SignedParts>
-			<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>
-				<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.sample05.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">service.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>
-	
-
-</service>
+</service>
 </serviceGroup>

Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/policy.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/policy.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/policy.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/policy.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
 					</sp:ProtectionToken>
 					<sp:AlgorithmSuite>
 						<wsp:Policy>
-							<sp:Basic256/>
+							<sp:Basic128/>
 						</wsp:Policy>
 					</sp:AlgorithmSuite>
 					<sp:Layout>
@@ -58,9 +58,6 @@
 								<sp:RequireInternalReference/>
 							</wsp:Policy>
 						</sp:IssuedToken>
-						<sp:SignedParts>
-							<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing"/>
-						</sp:SignedParts>
 					</wsp:Policy>
 		     </sp:SupportingTokens>
 			<sp:SignedParts>