You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/08/22 11:29:16 UTC
svn commit: r1516394 - in /cxf/branches/2.7.x-fixes/rt/security/src:
main/java/org/apache/cxf/rt/security/xacml/
test/java/org/apache/cxf/rt/security/xacml/
Author: coheigea
Date: Thu Aug 22 09:29:16 2013
New Revision: 1516394
URL: http://svn.apache.org/r1516394
Log:
Renaming CXF attribute for the WSDL endpoint
Conflicts:
rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
Modified:
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/XACMLConstants.java
cxf/branches/2.7.x-fixes/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java
Modified: cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java?rev=1516394&r1=1516393&r2=1516394&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java (original)
+++ cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/DefaultXACMLRequestBuilder.java Thu Aug 22 09:29:16 2013
@@ -211,10 +211,10 @@ public class DefaultXACMLRequestBuilder
attributes.add(createAttribute(XACMLConstants.RESOURCE_WSDL_OPERATION_ID, XACMLConstants.XS_STRING, null,
wsdlOperation.toString()));
- // Resource URI
- String resourceURI = getResourceURI(message, sendFullRequestURL);
- attributes.add(createAttribute(XACMLConstants.RESOURCE_WSDL_URI_ID, XACMLConstants.XS_STRING, null,
- resourceURI));
+ // WSDL Endpoint
+ String endpointURI = getResourceURI(message, sendFullRequestURL);
+ attributes.add(createAttribute(XACMLConstants.RESOURCE_WSDL_ENDPOINT, XACMLConstants.XS_STRING, null,
+ endpointURI));
}
return RequestComponentBuilder.createResourceType(attributes, null);
Modified: cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/XACMLConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/XACMLConstants.java?rev=1516394&r1=1516393&r2=1516394&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/XACMLConstants.java (original)
+++ cxf/branches/2.7.x-fixes/rt/security/src/main/java/org/apache/cxf/rt/security/xacml/XACMLConstants.java Thu Aug 22 09:29:16 2013
@@ -79,8 +79,8 @@ public final class XACMLConstants {
"urn:cxf:apache:org:wsdl:operation-id";
public static final String RESOURCE_WSDL_SERVICE_ID =
"urn:cxf:apache:org:wsdl:service-id";
- public static final String RESOURCE_WSDL_URI_ID =
- "urn:cxf:apache:org:wsdl:resource-id";
+ public static final String RESOURCE_WSDL_ENDPOINT =
+ "urn:cxf:apache:org:wsdl:endpoint";
public static final String RESOURCE_FILE_NAME =
"urn:oasis:names:tc:xacml:1.0:resource:simple-file-name";
Modified: cxf/branches/2.7.x-fixes/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java?rev=1516394&r1=1516393&r2=1516394&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java (original)
+++ cxf/branches/2.7.x-fixes/rt/security/src/test/java/org/apache/cxf/rt/security/xacml/XACMLRequestBuilderTest.java Thu Aug 22 09:29:16 2013
@@ -174,7 +174,7 @@ public class XACMLRequestBuilderTest ext
} else if (XACMLConstants.RESOURCE_WSDL_OPERATION_ID.equals(attribute.getAttributeID())
&& operation.equals(attributeValue)) {
soapOperationSatisfied = true;
- } else if (XACMLConstants.RESOURCE_WSDL_URI_ID.equals(attribute.getAttributeID())
+ } else if (XACMLConstants.RESOURCE_WSDL_ENDPOINT.equals(attribute.getAttributeID())
&& resourceURL.equals(attributeValue)) {
resourceURISatisfied = true;
}
@@ -230,7 +230,7 @@ public class XACMLRequestBuilderTest ext
} else if (XACMLConstants.RESOURCE_WSDL_OPERATION_ID.equals(attribute.getAttributeID())
&& operation.equals(attributeValue)) {
soapOperationSatisfied = true;
- } else if (XACMLConstants.RESOURCE_WSDL_URI_ID.equals(attribute.getAttributeID())
+ } else if (XACMLConstants.RESOURCE_WSDL_ENDPOINT.equals(attribute.getAttributeID())
&& resourceURL.equals(attributeValue)) {
resourceURISatisfied = true;
}