[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/resources/xacml20-policy-config.xml

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jul  3 12:18:48 2012
New Revision: 1579

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1579&view=rev
Log:
XACML - recognize XPathVersion

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/resources/xacml20-policy-config.xml

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1579&r1=1578&r2=1579&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Jul  3 12:18:48 2012
@@ -1,6 +1,6 @@
 Changes in Release 2.5.4
 =============================================
-[JOST-191] - XACML code does not handle <SubjectAttributeDesignator/> Correctly
+[JOST-191] - XACML code does not handle <SubjectAttributeDesignator/> or <XPathVersion/> Correctly
 [JOST-190] - Backport some bugfixes from OpenSAML3
 [JOST-185] - Defaultbootstrap does not initialize the providers from the WS-Trust and WS-Policy schemas in openws
 [JOST-187] - Velocity initialization code uses an invalid key for the configuration properties set

Modified: branches/REL_2/src/main/resources/xacml20-policy-config.xml
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/resources/xacml20-policy-config.xml?rev=1579&r1=1578&r2=1579&view=diff
==============================================================================
--- branches/REL_2/src/main/resources/xacml20-policy-config.xml (original)
+++ branches/REL_2/src/main/resources/xacml20-policy-config.xml Tue Jul  3 12:18:48 2012
@@ -563,6 +563,20 @@
             <MarshallingClass className="org.opensaml.xacml.policy.impl.VariableReferenceTypeMarshaller"/>
             <UnmarshallingClass className="org.opensaml.xacml.policy.impl.VariableReferenceTypeUnmarshaller"/>
         </ObjectProvider> 
+        
+        <!-- xacml:XPathVersion -->
+        <ObjectProvider qualifiedName="xacml:XPathVersion">
+            <BuilderClass className="org.opensaml.core.xml.schema.impl.XSStringBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider> 
+        <!-- xacml:XPathVersionType -->
+        <ObjectProvider qualifiedName="xacml:XPathVersionType">
+            <BuilderClass className="org.opensaml.core.xml.schema.impl.XSStringBuilder"/>
+            <MarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.core.xml.schema.impl.XSStringUnmarshaller"/>
+        </ObjectProvider> 
+        
 
     </ObjectProviders>