[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/xacml/policy/impl/Subjec...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jul  3 10:31:30 2012
New Revision: 1578

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1578&view=rev
Log:
[JOST-191] - XACML code does not handle <SubjectAttributeDesignator/> Correctly

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
    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=1578&r1=1577&r2=1578&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Jul  3 10:31:30 2012
@@ -1,5 +1,6 @@
 Changes in Release 2.5.4
 =============================================
+[JOST-191] - XACML code does not handle <SubjectAttributeDesignator/> 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/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java?rev=1578&r1=1577&r2=1578&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/xacml/policy/impl/SubjectAttributeDesignatorTypeUnmarshaller.java Tue Jul  3 10:31:30 2012
@@ -25,7 +25,7 @@
 /**
  * Unmarshaller for {@link SubjectAttributeDesignatorType}.
  */
-public class SubjectAttributeDesignatorTypeUnmarshaller extends AttributeValueTypeUnmarshaller {
+public class SubjectAttributeDesignatorTypeUnmarshaller extends AttributeDesignatorTypeUnmarshaller {
 
     /** Constructor. */
     public SubjectAttributeDesignatorTypeUnmarshaller() {

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=1578&r1=1577&r2=1578&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 10:31:30 2012
@@ -467,16 +467,16 @@
                
         <!--SubjectAttributeDesignator -->
         <ObjectProvider qualifiedName="xacml:SubjectAttributeDesignator">
-            <BuilderClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeImplBuilder"/>
-            <MarshallingClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeMarshaller"/>
-            <UnmarshallingClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeUnmarshaller"/>
+            <BuilderClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeUnmarshaller"/>
         </ObjectProvider>
 
 		<!-- SubjectAttributeDesignator -->
         <ObjectProvider qualifiedName="xacml:SubjectAttributeDesignatorType">
-            <BuilderClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeImplBuilder"/>
-            <MarshallingClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeMarshaller"/>
-            <UnmarshallingClass className="org.opensaml.xacml.policy.impl.AttributeDesignatorTypeUnmarshaller"/>
+            <BuilderClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeImplBuilder"/>
+            <MarshallingClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xacml.policy.impl.SubjectAttributeDesignatorTypeUnmarshaller"/>
         </ObjectProvider>
 
         <!-- xacml:SubjectsType -->