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/28 11:41:18 UTC

svn commit: r381626 [8/8] - in /webservices/commons/modules/policy: examples/wsse/src/secParser/ src/org/apache/ws/policy/ src/org/apache/ws/policy/util/ test-resources/intersected/ test-resources/merged/ test/org/apache/ws/policy/

Added: webservices/commons/modules/policy/test-resources/merged/Policy25-25.xml
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test-resources/merged/Policy25-25.xml?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test-resources/merged/Policy25-25.xml (added)
+++ webservices/commons/modules/policy/test-resources/merged/Policy25-25.xml Tue Feb 28 02:40:59 2006
@@ -0,0 +1,1138 @@
+<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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </wsp:All>
+          </wsp:ExactlyOne>
+        </wsp:Policy>
+      </sp:AsymmetricBinding>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Basic256Rsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:IncludeTimestamp />
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <sp:AlgorithmSuite>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:TripleDesRsa15 />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:AlgorithmSuite>
+              <sp:ProtectTokens />
+            </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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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>
+      <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:OnlySignEntireHeadersAndBody />
+              <sp:Layout>
+                <wsp:Policy>
+                  <wsp:ExactlyOne>
+                    <wsp:All>
+                      <sp:Lax />
+                    </wsp:All>
+                  </wsp:ExactlyOne>
+                </wsp:Policy>
+              </sp:Layout>
+              <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>

Propchange: webservices/commons/modules/policy/test-resources/merged/Policy25-25.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: webservices/commons/modules/policy/test/org/apache/ws/policy/MergeTest.java
URL: http://svn.apache.org/viewcvs/webservices/commons/modules/policy/test/org/apache/ws/policy/MergeTest.java?rev=381626&view=auto
==============================================================================
--- webservices/commons/modules/policy/test/org/apache/ws/policy/MergeTest.java (added)
+++ webservices/commons/modules/policy/test/org/apache/ws/policy/MergeTest.java Tue Feb 28 02:40:59 2006
@@ -0,0 +1,72 @@
+/*
+ * 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 MergeTest extends PolicyTestCase {
+	PolicyReader reader = PolicyFactory
+			.getPolicyReader(PolicyFactory.OM_POLICY_READER);
+
+	public MergeTest() {
+		super("MergeTest");
+	}
+
+	public void test() throws Exception {
+		String r1, r2, r3;
+		Policy p1, p2, p3, p4;
+
+		File samples2 = new File(testResourceDir, "merged");
+		File[] files = samples2.listFiles();
+
+		String f, f1, f2;
+
+		for (int i = 0; i < files.length; i++) {
+			
+			if (files[i].isHidden()) {
+				continue;
+			}
+			
+			f = files[i].getName();
+			
+			f1 = f.substring(f.indexOf('y') + 1, f.indexOf('-'));
+			f2 = f.substring(f.indexOf('-') + 1, f.indexOf('.'));
+
+			r1 = "samples2" + File.separator + "Policy" + f1 + ".xml";
+			r2 = "samples2" + File.separator + "Policy" + f2 + ".xml";
+			r3 = "merged" + File.separator + f;
+
+			p1 = reader.readPolicy(getResource(r1));
+			p2 = reader.readPolicy(getResource(r2));
+			p3 = reader.readPolicy(getResource(r3));
+
+			// result
+			p4 = (Policy) p1.merge(p2);
+
+			if (!PolicyComparator.compare(p4, p3)) {
+				fail("samples2" + File.separator + " Policy" + f1
+						+ ".merge(Policy" + f2 + ") FAILED");
+			}
+		}
+	}
+}
\ No newline at end of file