svn commit: r1503688 - /cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java

[coheigea]

Author: coheigea
Date: Tue Jul 16 12:42:26 2013
New Revision: 1503688

URL: http://svn.apache.org/r1503688
Log:
Revert "Send the Resources as a single Attribute"

This reverts commit 777f805be600905fec5a5d89ed53813755683847.

Modified:
    
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java

Modified: 
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java?rev=1503688&r1=1503687&r2=1503688&view=diff
==============================================================================
--- 
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
 (original)
+++ 
cxf/trunk/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
 Tue Jul 16 12:42:26 2013
@@ -72,27 +72,12 @@ public class DefaultXACMLRequestBuilder 
 
     private ResourceType createResourceType(List<String> resources) {
         List<AttributeType> attributes = new ArrayList<AttributeType>();
-        
-        List<AttributeValueType> resourceAttributes = new 
ArrayList<AttributeValueType>();
         for (String resource : resources) {
             if (resource != null) {
-                AttributeValueType resourceAttributeValue = 
-                    RequestComponentBuilder.createAttributeValueType(resource);
-                resourceAttributes.add(resourceAttributeValue);
+                attributes.add(createAttribute(XACMLConstants.RESOURCE_ID, 
XACMLConstants.XS_STRING, null,
+                                               resource));
             }
         }
-
-        if (!resourceAttributes.isEmpty()) {
-            AttributeType resourceAttribute = 
-                createAttribute(
-                    XACMLConstants.RESOURCE_ID,
-                    XACMLConstants.XS_STRING,
-                    null,
-                    resourceAttributes
-                );
-            attributes.add(resourceAttribute);
-        }
-        
         return RequestComponentBuilder.createResourceType(attributes, null);
     }