ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1327918 - in /webservices/wss4j/trunk/src/main: java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java resources/saml2-xacml2-profile.xml
Date Thu, 19 Apr 2012 12:09:11 GMT
Author: coheigea
Date: Thu Apr 19 12:09:10 2012
New Revision: 1327918

URL: http://svn.apache.org/viewvc?rev=1327918&view=rev
Log:
Adding a custom XACML builder for standard namespace which OpenSAML doesn't support

Added:
    webservices/wss4j/trunk/src/main/resources/saml2-xacml2-profile.xml
Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java?rev=1327918&r1=1327917&r2=1327918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLBootstrap.java
Thu Apr 19 12:09:10 2012
@@ -47,11 +47,14 @@ public class OpenSAMLBootstrap extends D
         "/saml1-metadata-config.xml", 
         "/saml2-metadata-config.xml",
         "/saml2-metadata-validation-config.xml", 
+        "/saml2-metadata-attr-config.xml",
         "/saml2-metadata-idp-discovery-config.xml",
+        "/saml2-metadata-ui-config.xml",
         "/saml2-protocol-thirdparty-config.xml",
         "/saml2-metadata-query-config.xml", 
         "/saml2-assertion-delegation-restriction-config.xml",    
         "/saml2-ecp-config.xml",
+        "/saml2-xacml2-profile.xml",
         "/xacml10-saml2-profile-config.xml",
         "/xacml11-saml2-profile-config.xml",
         "/xacml20-context-config.xml",

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java?rev=1327918&r1=1327917&r2=1327918&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
(original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
Thu Apr 19 12:09:10 2012
@@ -51,7 +51,7 @@ public class OpenSAMLUtil {
     public synchronized static void initSamlEngine() {
         if (!samlEngineInitialized) {
             if (log.isDebugEnabled()) {
-                log.debug("Initilizing the opensaml2 library...");
+                log.debug("Initializing the opensaml2 library...");
             }
             try {
                 OpenSAMLBootstrap.bootstrap();

Added: webservices/wss4j/trunk/src/main/resources/saml2-xacml2-profile.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/resources/saml2-xacml2-profile.xml?rev=1327918&view=auto
==============================================================================
--- webservices/wss4j/trunk/src/main/resources/saml2-xacml2-profile.xml (added)
+++ webservices/wss4j/trunk/src/main/resources/saml2-xacml2-profile.xml Thu Apr 19 12:09:10
2012
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xacml-samlp="urn:oasis:xacml:2.0:saml:protocol:schema:os"
xmlns:xacml-saml="urn:oasis:xacml:2.0:saml:assertion:schema:os" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
xmlns="http://www.opensaml.org/xmltooling-config">
+
+    <!-- XACML 2.0 for SAML 2 Profile Object Providers -->
+	<ObjectProviders>
+    
+		<!-- ReferencedPoliciesType -->
+        <ObjectProvider qualifiedName="xacml-saml:ReferencedPolicies">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+        <!-- ReferencedPoliciesType -->
+        <ObjectProvider qualifiedName="xacml-saml:ReferencedPoliciesType">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.ReferencedPoliciesTypeUnmarshaller"/>
+        </ObjectProvider>
+	
+         
+       <!-- XACMLAuthzDecisionStatement -->
+        <ObjectProvider qualifiedName="xacml-saml:XACMLAuthzDecisionStatement">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+        <ObjectProvider qualifiedName="xacml-saml:XACMLAuthzDecisionStatementType">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionStatementTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+        <!-- XACMLPolicyStatement -->
+        <ObjectProvider qualifiedName="xacml-saml:XACMLPolicyStatement">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+        <ObjectProvider qualifiedName="xacml-saml:XACMLPolicyStatementType">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyStatementTypeUnmarshaller"/>
+        </ObjectProvider>
+           
+       <!-- XACMLAuthzDecisionQuery provider -->
+        <ObjectProvider qualifiedName="xacml-samlp:XACMLAuthzDecisionQuery">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeUnmarshaller"/>
+        </ObjectProvider>
+     
+        <ObjectProvider qualifiedName="xacml-samlp:XACMLAuthzDecisionQueryType">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLAuthzDecisionQueryTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+        <!-- XACMLPolicyQuery provider -->
+        <ObjectProvider qualifiedName="xacml-samlp:XACMLPolicyQuery">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeUnmarshaller"/>
+        </ObjectProvider>
+     
+        <ObjectProvider qualifiedName="xacml-samlp:XACMLPolicyQueryType">
+            <BuilderClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.profile.saml.impl.XACMLPolicyQueryTypeUnmarshaller"/>
+        </ObjectProvider>
+        
+    </ObjectProviders>
+    
+ </XMLTooling>



Mime
View raw message