You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/10/10 05:15:00 UTC

svn commit: r583348 - in /webservices/axis2/trunk/c/neethi: include/neethi_assertion.h src/assertion_builder.c src/test-resources/ test/policies/symmetric_binding_policy.xml test/test-resources/

Author: manjula
Date: Tue Oct  9 20:14:59 2007
New Revision: 583348

URL: http://svn.apache.org/viewvc?rev=583348&view=rev
Log:
Moving test-resources to test and removing a printf.

Added:
    webservices/axis2/trunk/c/neethi/test/test-resources/
      - copied from r583346, webservices/axis2/trunk/c/neethi/src/test-resources/
Removed:
    webservices/axis2/trunk/c/neethi/src/test-resources/
Modified:
    webservices/axis2/trunk/c/neethi/include/neethi_assertion.h
    webservices/axis2/trunk/c/neethi/src/assertion_builder.c
    webservices/axis2/trunk/c/neethi/test/policies/symmetric_binding_policy.xml

Modified: webservices/axis2/trunk/c/neethi/include/neethi_assertion.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/neethi_assertion.h?rev=583348&r1=583347&r2=583348&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/neethi_assertion.h (original)
+++ webservices/axis2/trunk/c/neethi/include/neethi_assertion.h Tue Oct  9 20:14:59 2007
@@ -52,6 +52,7 @@
         ASSERTION_TYPE_MUST_SUPPORT_REF_EXTERNAL_URI,
         ASSERTION_TYPE_MUST_SUPPORT_REF_EMBEDDED_TOKEN,
         ASSERTION_TYPE_WSS10,
+        ASSERTION_TYPE_WSS11,
         ASSERTION_TYPE_RAMPART_CONFIG,
         ASSERTION_TYPE_ASSYMMETRIC_BINDING,
         ASSERTION_TYPE_SYMMETRIC_BINDING,
@@ -69,6 +70,9 @@
         ASSERTION_TYPE_REQUIRE_ISSUER_SERIAL_REFERENCE,
         ASSERTION_TYPE_REQUIRE_EMBEDDED_TOKEN_REFERENCE,
         ASSERTION_TYPE_REQUIRE_THUMBPRINT_REFERENCE,
+        ASSERTION_TYPE_MUST_SUPPORT_REF_THUMBPRINT,
+        ASSERTION_TYPE_MUST_SUPPORT_REF_ENCRYPTED_KEY,
+        ASSERTION_TYPE_REQUIRE_SIGNATURE_CONFIRMATION,
         ASSERTION_TYPE_WSS_X509_V1_TOKEN_10,
         ASSERTION_TYPE_WSS_X509_V3_TOKEN_10,
         ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS,

Modified: webservices/axis2/trunk/c/neethi/src/assertion_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/assertion_builder.c?rev=583348&r1=583347&r2=583348&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/assertion_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/assertion_builder.c Tue Oct  9 20:14:59 2007
@@ -484,8 +484,6 @@
         AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
                         "[neethi] Unknown Assertion %s",
                         localname);
-        printf("Unknown Assertion %s", localname);
-
         return NULL;
         
         /*assertion = neethi_assertion_create(env);

Modified: webservices/axis2/trunk/c/neethi/test/policies/symmetric_binding_policy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/test/policies/symmetric_binding_policy.xml?rev=583348&r1=583347&r2=583348&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/test/policies/symmetric_binding_policy.xml (original)
+++ webservices/axis2/trunk/c/neethi/test/policies/symmetric_binding_policy.xml Tue Oct  9 20:14:59 2007
@@ -8,7 +8,7 @@
                             <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never">
                                 <wsp:Policy>
                                     <sp:RequireDerivedKeys/>
-                                    <!--sp:RequireThumbprintReference/-->
+                                    <sp:RequireThumbprintReference/>
                                     <sp:WssX509V3Token10/>
                                 </wsp:Policy>
                             </sp:X509Token>
@@ -46,13 +46,13 @@
                     <sp:MustSupportRefEncryptedKey/>
                 </wsp:Policy>
             </sp:Wss11>
-            <!--sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+            <sp:Trust10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
                 <wsp:Policy>
                     <sp:MustSupportIssuedTokens/>
                     <sp:RequireClientEntropy/>
                     <sp:RequireServerEntropy/>
                 </wsp:Policy>
-            </sp:Trust10--> 
+            </sp:Trust10> 
             <sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
                 <sp:Body/>
             </sp:EncryptedParts>



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