You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by sa...@apache.org on 2006/02/20 13:59:53 UTC

svn commit: r379123 - in /webservices/commons/modules/policy: test-resources/normalize2/ test-resources/samples2/ test/org/apache/ws/policy/

Author: sanka
Date: Mon Feb 20 04:59:48 2006
New Revision: 379123

URL: http://svn.apache.org/viewcvs?rev=379123&view=rev
Log:
Added more testcases to test policy.normalize() function

Added:
    webservices/commons/modules/policy/test-resources/normalize2/
    webservices/commons/modules/policy/test-resources/normalize2/Policy1.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy10.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy11.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy12.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy13.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy14.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy15.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy16.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy17.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy18.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy19.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy2.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy20.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy3.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy4.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy5.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy6.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy7.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy8.xml
    webservices/commons/modules/policy/test-resources/normalize2/Policy9.xml
    webservices/commons/modules/policy/test-resources/samples2/
    webservices/commons/modules/policy/test-resources/samples2/Policy1.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy10.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy11.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy12.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy13.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy14.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy15.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy16.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy17.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy18.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy19.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy2.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy20.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy21.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy22.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy23.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy24.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy25.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy3.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy4.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy5.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy6.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy7.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy8.xml
    webservices/commons/modules/policy/test-resources/samples2/Policy9.xml
    webservices/commons/modules/policy/test/org/apache/ws/policy/Normalize2Test.java

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy1.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy1.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy1.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy1.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy10.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy10.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy10.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy10.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy11.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy11.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy11.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy11.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy12.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy12.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy12.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy12.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,198 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:IncludeTimestamp />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:IncludeTimestamp />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy13.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy13.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy13.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy13.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy14.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy14.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy14.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy14.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy15.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy15.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy15.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy15.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy16.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy16.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy16.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy16.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,140 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <wsrm:RMAssertion xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+        <wsrm:InactivityTimeout Milliseconds="9000" />
+        <wsrm:BaseRetransmissionInterval Milliseconds="1000" />
+        <wsrm:ExponentialBackoff />
+        <wsrm:AcknowledgementInterval Milliseconds="1000" />
+      </wsrm:RMAssertion>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy17.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy17.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy17.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy17.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,69 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:EncryptSignature />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy18.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy18.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy18.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy18.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,13 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All />
+    <wsp:All>
+      <wsrm:RMAssertion xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+        <wsrm:InactivityTimeout Milliseconds="9000" />
+        <wsrm:BaseRetransmissionInterval Milliseconds="1000" />
+        <wsrm:ExponentialBackoff />
+        <wsrm:AcknowledgementInterval Milliseconds="1000" />
+      </wsrm:RMAssertion>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy19.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy19.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy19.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy19.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,12 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+  <wsp:ExactlyOne>
+    <wsp:All>
+      <wsrm:RMAssertion xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+        <wsrm:InactivityTimeout Milliseconds="9000" />
+        <wsrm:BaseRetransmissionInterval Milliseconds="1000" />
+        <wsrm:ExponentialBackoff />
+        <wsrm:AcknowledgementInterval Milliseconds="1000" />
+      </wsrm:RMAssertion>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy2.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy2.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy2.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy2.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,68 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy20.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy20.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy20.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy20.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,198 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy3.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy3.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy3.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy3.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy4.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy4.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy4.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy4.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy5.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy5.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy5.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy5.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy6.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy6.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy6.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy6.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy7.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy7.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy7.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy7.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,133 @@
+<wsp:Policy 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>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+    <wsp:All>
+      <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+        <wsp:Policy>
+          <wsp:ExactlyOne>
+            <wsp:All>
+              <sp:RecipientToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:RecipientToken>
+              <sp:InitiatorToken>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+                        <wsp:Policy>
+                          <wsp:ExactlyOne>
+                            <wsp:All>
+                              <sp:WssX509V3Token10 />
+                            </wsp:All>
+                          </wsp:ExactlyOne>
+                        </wsp:Policy>
+                      </sp:X509Token>
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:InitiatorToken>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+              <sp:OnlySignEntireHeadersAndBody />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+    </wsp:All>
+  </wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy8.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy8.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy8.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy8.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/normalize2/Policy9.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/normalize2/Policy9.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/normalize2/Policy9.xml (added)
+++ webservices/commons/modules/policy/test-resources/normalize2/Policy9.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy'>
+<wsp:ExactlyOne>
+<wsp:All></wsp:All>
+</wsp:ExactlyOne>
+</wsp:Policy>

Added: webservices/commons/modules/policy/test-resources/samples2/Policy1.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy1.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy1.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy1.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy1 -->
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy10.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy10.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy10.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy10.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy10 -->
+  <wsp:All>
+    <wsp:ExactlyOne />
+  </wsp:All>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy11.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy11.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy11.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy11.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,4 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy11 -->
+  <wsp:ExactlyOne />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy12.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy12.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy12.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy12.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,57 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<!-- Policy12x -->
+	<sp:AsymmetricBinding>
+		<wsp:Policy>
+			<wsp:All>
+				<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: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:Layout>
+					<wsp:Policy>
+						<sp:Lax />
+					</wsp:Policy>
+				</sp:Layout>
+				<sp:ProtectTokens />
+				<sp:OnlySignEntireHeadersAndBody />
+			</wsp:All>
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:IncludeTimestamp />
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<wsp:ExactlyOne>
+								<sp:Basic256Rsa15 />
+								<sp:TripleDesRsa15 />
+							</wsp:ExactlyOne>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+				</wsp:All>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256Rsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy13.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy13.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy13.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy13.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy13 -->
+  <wsp:ExactlyOne>
+    <wsp:Policy />
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy14.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy14.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy14.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy14.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy14 -->
+  <wsp:ExactlyOne>
+    <wsp:All />
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy15.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy15.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy15.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy15.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy15 -->
+  <wsp:ExactlyOne>
+    <wsp:ExactlyOne />
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy16.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy16.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy16.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy16.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,48 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+            xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
+  <!-- 2 -->
+  <sp:AsymmetricBinding  >
+    <wsp:Policy>
+      <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: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:AlgorithmSuite>
+        <wsp:Policy>
+          <sp:TripleDesRsa15 />
+        </wsp:Policy>
+      </sp:AlgorithmSuite>
+      <sp:Layout>
+        <wsp:Policy>
+          <sp:Lax />
+        </wsp:Policy>
+      </sp:Layout>
+      <sp:IncludeTimestamp />
+      <sp:ProtectTokens />
+      <sp:OnlySignEntireHeadersAndBody />
+    </wsp:Policy>
+  </sp:AsymmetricBinding>
+  <wsrm:RMAssertion wsp:Optional="true">
+    <wsrm:InactivityTimeout Milliseconds="9000"/>
+    <wsrm:BaseRetransmissionInterval Milliseconds="1000"/>
+    <wsrm:ExponentialBackoff/>
+    <wsrm:AcknowledgementInterval Milliseconds="1000"/>
+  </wsrm:RMAssertion>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy17.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy17.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy17.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy17.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,42 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" >
+  <!-- Policy17 -->
+  <!-- Asymmetric Policy A16 - TripleDesRsa15, no timestamp, encrypt signature, include tokens under signature -->
+    <sp:AsymmetricBinding  >
+      <wsp:Policy>
+        <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: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:AlgorithmSuite>
+          <wsp:Policy>
+            <sp:TripleDesRsa15 />
+          </wsp:Policy>
+        </sp:AlgorithmSuite>
+        <sp:Layout>
+          <wsp:Policy>
+            <sp:Lax />
+          </wsp:Policy>
+        </sp:Layout>
+        <sp:EncryptSignature />
+        <sp:ProtectTokens />
+        <sp:OnlySignEntireHeadersAndBody />
+      </wsp:Policy>
+    </sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy18.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy18.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy18.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy18.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,10 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
+            xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" >
+  <!-- Policy18 -->
+  <wsrm:RMAssertion wsp:Optional="true">
+    <wsrm:InactivityTimeout Milliseconds="9000"/>
+    <wsrm:BaseRetransmissionInterval Milliseconds="1000"/>
+    <wsrm:ExponentialBackoff/>
+    <wsrm:AcknowledgementInterval Milliseconds="1000"/>
+  </wsrm:RMAssertion>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy19.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy19.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy19.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy19.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,10 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
+            xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy" >
+  <!-- Policy19 -->
+  <wsrm:RMAssertion wsp:Optional="false">
+    <wsrm:InactivityTimeout Milliseconds="9000"/>
+    <wsrm:BaseRetransmissionInterval Milliseconds="1000"/>
+    <wsrm:ExponentialBackoff/>
+    <wsrm:AcknowledgementInterval Milliseconds="1000"/>
+  </wsrm:RMAssertion>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy2.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy2.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy2.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy2.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,39 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
+            xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy" >
+  <!-- 1B -->
+  <!-- Asymmetric Policy A12 - X509 with mutual authentication and 3DES -->
+  <sp:AsymmetricBinding>
+    <wsp:Policy>
+      <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: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:AlgorithmSuite>
+        <wsp:Policy>
+          <sp:TripleDesRsa15 />
+        </wsp:Policy>
+      </sp:AlgorithmSuite>
+      <sp:Layout>
+        <wsp:Policy>
+          <sp:Lax />
+        </wsp:Policy>
+      </sp:Layout>
+      <sp:IncludeTimestamp />
+      <sp:OnlySignEntireHeadersAndBody />
+    </wsp:Policy>
+  </sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy20.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy20.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy20.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy20.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,121 @@
+<wsp:Policy 
+  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:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+  <!-- Policy20 -->
+  <wsp:ExactlyOne>
+    <!-- Asymmetric Policy A1 - Basic256Rsa15, timestamp, do not encrypt signature, include tokens under signature -->
+    <sp:AsymmetricBinding  >
+      <wsp:Policy>
+        <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: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:AlgorithmSuite>
+          <wsp:Policy>
+            <sp:Basic256Rsa15 />
+          </wsp:Policy>
+        </sp:AlgorithmSuite>
+        <sp:Layout>
+          <wsp:Policy>
+            <sp:Lax />
+          </wsp:Policy>
+        </sp:Layout>
+        <sp:IncludeTimestamp />
+        <sp:ProtectTokens />
+        <sp:OnlySignEntireHeadersAndBody />
+      </wsp:Policy>
+    </sp:AsymmetricBinding>
+    <!-- Asymmetric Policy A2 - TripleDesRsa15, timestamp, do not encrypt signature, include tokens under signature -->
+    <sp:AsymmetricBinding  >
+      <wsp:Policy>
+        <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: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:AlgorithmSuite>
+          <wsp:Policy>
+            <sp:TripleDesRsa15 />
+          </wsp:Policy>
+        </sp:AlgorithmSuite>
+        <sp:Layout>
+          <wsp:Policy>
+            <sp:Lax />
+          </wsp:Policy>
+        </sp:Layout>
+        <sp:IncludeTimestamp />
+        <sp:ProtectTokens />
+        <sp:OnlySignEntireHeadersAndBody />
+      </wsp:Policy>
+    </sp:AsymmetricBinding>
+    <!-- Asymmetric Policy A3 - Basic256Rsa15, no timestamp, do not encrypt signature, include tokens under signature -->
+    <sp:AsymmetricBinding  >
+      <wsp:Policy>
+        <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: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:AlgorithmSuite>
+          <wsp:Policy>
+            <sp:Basic256Rsa15 />
+          </wsp:Policy>
+        </sp:AlgorithmSuite>
+        <sp:Layout>
+          <wsp:Policy>
+            <sp:Lax />
+          </wsp:Policy>
+        </sp:Layout>
+        <sp:ProtectTokens />
+        <sp:OnlySignEntireHeadersAndBody />
+      </wsp:Policy>
+    </sp:AsymmetricBinding>
+  </wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy21.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy21.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy21.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy21.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,3 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+	<wsp:ExactlyOne />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy22.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy22.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy22.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy22.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,5 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+	<wsp:ExactlyOne>
+		<wsp:All />
+	</wsp:ExactlyOne>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy23.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy23.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy23.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy23.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,54 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<sp:AsymmetricBinding>
+		<wsp:Policy>
+			<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: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:Layout>
+				<wsp:Policy>
+					<sp:Lax />
+				</wsp:Policy>
+			</sp:Layout>
+			<sp:ProtectTokens />
+			<sp:OnlySignEntireHeadersAndBody />
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<wsp:ExactlyOne>
+								<sp:Basic256Rsa15 />
+								<sp:TripleDesRsa15 />
+							</wsp:ExactlyOne>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:IncludeTimestamp />
+				</wsp:All>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256Rsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy24.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy24.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy24.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy24.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,51 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<sp:AsymmetricBinding>
+		<wsp:Policy>
+			<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: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:Layout>
+				<wsp:Policy>
+					<sp:Lax />
+				</wsp:Policy>
+			</sp:Layout>
+			<sp:ProtectTokens />
+			<sp:OnlySignEntireHeadersAndBody />
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256Rsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:IncludeTimestamp />
+				</wsp:All>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:TripleDesRsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy25.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy25.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy25.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,59 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<sp:AsymmetricBinding>
+		<wsp:Policy>
+			<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: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:OnlySignEntireHeadersAndBody />
+			<sp:Layout>
+				<wsp:Policy>
+					<sp:Lax />
+				</wsp:Policy>
+			</sp:Layout>
+			<wsp:ExactlyOne>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256Rsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:IncludeTimestamp />
+					<sp:ProtectTokens />
+				</wsp:All>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:TripleDesRsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:ProtectTokens />
+				</wsp:All>
+				<wsp:All>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256Rsa15 />
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+				</wsp:All>
+			</wsp:ExactlyOne>
+		</wsp:Policy>
+	</sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy3.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy3.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy3.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy3.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,4 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy3 -->
+  <wsp:Policy />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy4.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy4.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy4.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy4.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,4 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy4 -->
+  <wsp:All />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy5.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy5.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy5.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy5.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,4 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy5 -->
+  <wsp:ExactlyOne />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy6.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy6.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy6.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy6.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,4 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy6 -->
+  <wsp:All />
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy7.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy7.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy7.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy7.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,40 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
+	xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+	<sp:AsymmetricBinding>
+		<wsp:Policy>
+			<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: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:AlgorithmSuite>
+				<wsp:Policy>
+					<sp:TripleDesRsa15 />
+				</wsp:Policy>
+			</sp:AlgorithmSuite>
+			<sp:Layout>
+				<wsp:Policy>
+					<sp:Lax />
+				</wsp:Policy>
+			</sp:Layout>
+			<sp:IncludeTimestamp />
+			<sp:ProtectTokens wsp:Optional="true" />
+			<sp:OnlySignEntireHeadersAndBody />
+		</wsp:Policy>
+	</sp:AsymmetricBinding>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy8.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy8.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy8.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy8.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy8 -->
+  <wsp:All>
+    <wsp:Policy />
+  </wsp:All>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test-resources/samples2/Policy9.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/samples2/Policy9.xml?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/samples2/Policy9.xml (added)
+++ webservices/commons/modules/policy/test-resources/samples2/Policy9.xml Mon Feb 20 04:59:48 2006
@@ -0,0 +1,6 @@
+<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >
+  <!-- Policy9 -->
+  <wsp:All>
+    <wsp:All />
+  </wsp:All>
+</wsp:Policy>
\ No newline at end of file

Added: webservices/commons/modules/policy/test/org/apache/ws/policy/Normalize2Test.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test/org/apache/ws/policy/Normalize2Test.java?rev=379123&view=auto
==============================================================================
--- webservices/commons/modules/policy/test/org/apache/ws/policy/Normalize2Test.java (added)
+++ webservices/commons/modules/policy/test/org/apache/ws/policy/Normalize2Test.java Mon Feb 20 04:59:48 2006
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ws.policy;
+
+import java.io.File;
+
+import org.apache.ws.policy.util.PolicyComparator;
+import org.apache.ws.policy.util.PolicyFactory;
+import org.apache.ws.policy.util.PolicyReader;
+
+/**
+ * @author Sanka Samaranayake (sanka@apache.org)
+ */
+public class Normalize2Test extends PolicyTestCase {
+	PolicyReader reader = PolicyFactory
+			.getPolicyReader(PolicyFactory.OM_POLICY_READER);
+
+	public Normalize2Test() {
+		super("Normalize2Test");
+	}
+
+	public void test() throws Exception {
+		String r1, r2;
+		Policy p1, p2;
+
+		for (int i = 1; i < 21; i++) {
+
+			r1 = "samples2" + File.separator + "Policy" + i + ".xml";
+			r2 = "normalize2" + File.separator + "Policy" + i + ".xml";
+
+			p1 = reader.readPolicy(getResource(r1));
+			p1 = (Policy) p1.normalize();
+
+			p2 = reader.readPolicy(getResource(r2));
+
+			if (!PolicyComparator.compare(p1, p2)) {
+				fail("samples2" + File.separator + "Policy" + i + ".normalize() FAILED");
+			}
+		}
+	}
+}
\ No newline at end of file