cxf-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	dk...@apache.org
Subject	svn commit: r1230568 [1/2] - in /cxf/trunk: api/ api/src/main/java/org/apache/cxf/transport/ api/src/main/java/org/apache/cxf/ws/policy/ api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/ api/src/main/java/org/apache/cxf/ws/policy/builder/primiti...
Date	Thu, 12 Jan 2012 14:46:32 GMT
Author: dkulp Date: Thu Jan 12 14:46:29 2012 New Revision: 1230568 URL: http://svn.apache.org/viewvc?rev=1230568&view=rev Log: Move all the policy stuff out of api into rt/ws/policy to avoid the split package. (This introduces a hard dependency on ws-policy.jar in many places. Will work on that tomorrow.) Added: cxf/trunk/api/src/main/java/org/apache/cxf/transport/Assertor.java - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyFeatureTest.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/ cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyException.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/ cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/foo.xml (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/foo.xml cxf/trunk/rt/ws/policy/src/test/resources/schemas/ cxf/trunk/rt/ws/policy/src/test/resources/schemas/foo.xsd (contents, props changed) - copied, changed from r1230255, cxf/trunk/api/src/test/resources/schemas/foo.xsd Removed: cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyException.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/foo.xml cxf/trunk/api/src/test/resources/schemas/foo.xsd cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyFeatureTest.java cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml Modified: cxf/trunk/api/pom.xml cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/BackendTcpConduit.java cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/TCPConduit.java cxf/trunk/rt/frontend/jaxws/pom.xml cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java cxf/trunk/rt/transports/http/pom.xml cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java cxf/trunk/rt/ws/addr/pom.xml cxf/trunk/rt/ws/mex/pom.xml cxf/trunk/rt/ws/policy/pom.xml cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java cxf/trunk/rt/ws/rm/pom.xml cxf/trunk/rt/ws/security/pom.xml Modified: cxf/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/api/pom.xml (original) +++ cxf/trunk/api/pom.xml Thu Jan 12 14:46:29 2012 @@ -155,9 +155,6 @@ <deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir> </deleteDirs> </xsdOption> - <xsdOption> - <xsd>${basedir}/src/test/resources/schemas/foo.xsd</xsd> - </xsdOption> </xsdOptions> </configuration> </execution> Copied: cxf/trunk/api/src/main/java/org/apache/cxf/transport/Assertor.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java) URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/Assertor.java?p2=cxf/trunk/api/src/main/java/org/apache/cxf/transport/Assertor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== --- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java (original) +++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/Assertor.java Thu Jan 12 14:46:29 2012 @@ -17,14 +17,14 @@ * under the License. / -package org.apache.cxf.ws.policy; +package org.apache.cxf.transport; import javax.xml.namespace.QName; import org.apache.cxf.message.Message; /* - * API used in the WS-Policy framework to allow a message exchange participant to + * API used in the to allow a message exchange participant to * assert its capabilities for the underlying message. / public interface Assertor { Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/BackendTcpConduit.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/BackendTcpConduit.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/BackendTcpConduit.java (original) +++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/BackendTcpConduit.java Thu Jan 12 14:46:29 2012 @@ -32,7 +32,7 @@ import org.apache.cxf.configuration.Conf import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; import org.apache.cxf.transport.AbstractConduit; -import org.apache.cxf.ws.policy.Assertor; +import org.apache.cxf.transport.Assertor; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; Modified: cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/TCPConduit.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/TCPConduit.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/TCPConduit.java (original) +++ cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/tcp/TCPConduit.java Thu Jan 12 14:46:29 2012 @@ -38,8 +38,8 @@ import org.apache.cxf.configuration.Conf import org.apache.cxf.message.Message; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.AbstractConduit; +import org.apache.cxf.transport.Assertor; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.ws.policy.Assertor; public class TCPConduit extends AbstractConduit Modified: cxf/trunk/rt/frontend/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/pom.xml (original) +++ cxf/trunk/rt/frontend/jaxws/pom.xml Thu Jan 12 14:46:29 2012 @@ -116,6 +116,12 @@ <artifactId>cxf-rt-ws-addr</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.springframework</groupId> Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java Thu Jan 12 14:46:29 2012 @@ -86,7 +86,6 @@ import org.apache.cxf.ws.addressing.JAXW import org.apache.cxf.ws.addressing.Names; import org.apache.cxf.ws.addressing.VersionTransformer; import org.apache.cxf.ws.addressing.WSAddressingFeature; -import org.apache.cxf.ws.policy.PolicyConstants; import org.apache.cxf.wsdl.WSDLManager; import org.apache.neethi.Constants; @@ -315,8 +314,8 @@ public class JaxWsEndpointImpl extends E writer = new W3CDOMStreamWriter(); writer.writeStartElement("wsp", "Policy", Constants.URI_POLICY_NS); - writer.writeAttribute("wsu", PolicyConstants.WSU_NAMESPACE_URI, - PolicyConstants.WSU_ID_ATTR_NAME, polRefId.toString()); + writer.writeAttribute("wsu", Constants.URI_WSU_NS, + Constants.ATTR_ID, polRefId.toString()); writer.writeStartElement("wsam", "Addressing", JAXWSAConstants.NS_WSAM); if (!addressing.required()) { writer.writeAttribute("wsp", Constants.URI_POLICY_NS, Copied: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java (from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java?p2=cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java&p1=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/PolicyAnnotationTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java Thu Jan 12 14:46:29 2012 @@ -17,7 +17,7 @@ under the License. / -package org.apache.cxf.ws.policy; +package org.apache.cxf.jaxws.ws; import java.util.Arrays; import java.util.HashMap; @@ -219,7 +219,7 @@ public class PolicyAnnotationTest extend @Policy(uri = "annotationpolicies/TestImplPolicy.xml") } ) - @WebService(endpointInterface = "org.apache.cxf.ws.policy.PolicyAnnotationTest$TestInterface") + @WebService(endpointInterface = "org.apache.cxf.jaxws.ws.PolicyAnnotationTest$TestInterface") public static class TestImpl implements TestInterface { public int echoInt(int i) { return i; Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyAnnotationTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java (from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyFeatureTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java?p2=cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java&p1=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyFeatureTest.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/PolicyFeatureTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java Thu Jan 12 14:46:29 2012 @@ -16,7 +16,7 @@ specific language governing permissions and limitations * under the License. / -package org.apache.cxf.ws.policy.spring; +package org.apache.cxf.jaxws.ws; import java.util.List; @@ -77,7 +77,7 @@ public class PolicyFeatureTest extends A @Test public void testServerFactoryWith2007Xml() { - bus = new SpringBusFactory().createBus("/org/apache/cxf/ws/policy/spring/server.xml"); + bus = new SpringBusFactory().createBus("/org/apache/cxf/jaxws/ws/server.xml"); JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean(); sf.setServiceBean(new GreeterImpl()); @@ -107,7 +107,7 @@ public class PolicyFeatureTest extends A @Test public void testServerFactoryWith2004Xml() { bus = - new SpringBusFactory().createBus("/org/apache/cxf/ws/policy/spring/server.xml"); + new SpringBusFactory().createBus("/org/apache/cxf/jaxws/ws/server.xml"); JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean(); sf.setServiceBean(new GreeterImpl()); @@ -136,7 +136,7 @@ public class PolicyFeatureTest extends A @Test public void testPolicyReference() { bus = - new SpringBusFactory().createBus("/org/apache/cxf/ws/policy/spring/server.xml"); + new SpringBusFactory().createBus("/org/apache/cxf/jaxws/ws/server.xml"); JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean(); sf.setServiceBean(new GreeterImpl()); Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/PolicyFeatureTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml&p1=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/spring/server.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ws/server.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestImplPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestImplPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestInterfacePolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestInterfacePolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationInputPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationOutputPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTInputPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTOutputPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPTPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestOperationPolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestOperationPolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Copied: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml (from r1230255, cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml?p2=cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml&p1=cxf/trunk/rt/ws/policy/src/test/resources/annotationpolicies/TestPortTypePolicy.xml&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/frontend/jaxws/src/test/resources/annotationpolicies/TestPortTypePolicy.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: cxf/trunk/rt/transports/http/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/pom.xml (original) +++ cxf/trunk/rt/transports/http/pom.xml Thu Jan 12 14:46:29 2012 @@ -60,6 +60,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> </dependency> Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Thu Jan 12 14:46:29 2012 @@ -64,6 +64,7 @@ import org.apache.cxf.security.SecurityC import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.AbstractDestination; import org.apache.cxf.transport.AbstractMultiplexDestination; +import org.apache.cxf.transport.Assertor; import org.apache.cxf.transport.Conduit; import org.apache.cxf.transport.http.policy.PolicyUtils; import org.apache.cxf.transport.https.CertConstraints; @@ -71,7 +72,6 @@ import org.apache.cxf.transport.https.Ce import org.apache.cxf.transport.https.SSLUtils; import org.apache.cxf.transports.http.configuration.HTTPServerPolicy; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.ws.policy.Assertor; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.wsdl.EndpointReferenceUtils; import org.apache.cxf.wsdl.WSDLLibrary; Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Jan 12 14:46:29 2012 @@ -69,6 +69,7 @@ import org.apache.cxf.message.MessageUti import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.service.model.EndpointInfo; import org.apache.cxf.transport.AbstractConduit; +import org.apache.cxf.transport.Assertor; import org.apache.cxf.transport.MessageObserver; import org.apache.cxf.transport.http.auth.DefaultBasicAuthSupplier; import org.apache.cxf.transport.http.auth.DigestAuthSupplier; @@ -84,7 +85,6 @@ import org.apache.cxf.transports.http.co import org.apache.cxf.workqueue.AutomaticWorkQueue; import org.apache.cxf.workqueue.WorkQueueManager; import org.apache.cxf.ws.addressing.EndpointReferenceType; -import org.apache.cxf.ws.policy.Assertor; import org.apache.cxf.ws.policy.PolicyEngine; import static org.apache.cxf.message.Message.DECOUPLED_CHANNEL_MESSAGE; Modified: cxf/trunk/rt/ws/addr/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/pom.xml (original) +++ cxf/trunk/rt/ws/addr/pom.xml Thu Jan 12 14:46:29 2012 @@ -79,6 +79,11 @@ <artifactId>cxf-rt-bindings-soap</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <profiles> Modified: cxf/trunk/rt/ws/mex/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/mex/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/mex/pom.xml (original) +++ cxf/trunk/rt/ws/mex/pom.xml Thu Jan 12 14:46:29 2012 @@ -56,6 +56,16 @@ </dependency> <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-addr</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-policy</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${project.version}</version> </dependency> Modified: cxf/trunk/rt/ws/policy/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/pom.xml (original) +++ cxf/trunk/rt/ws/policy/pom.xml Thu Jan 12 14:46:29 2012 @@ -75,35 +75,7 @@ <artifactId>cxf-rt-core</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - <version>${project.version}</version> - </dependency> - <!-- Test stuff --> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-transports-local</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - - - - - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-testutils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -153,6 +125,22 @@ <goal>xsdtojava</goal> </goals> </execution> + <execution> + <id>generate-test-sources</id> + <phase>generate-test-sources</phase> + <goals> + <goal>xsdtojava-tests</goal> + </goals> + <configuration> + <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot> + <xsdOptions> + <xsdOption> + <xsd>${basedir}/src/test/resources/schemas/foo.xsd</xsd> + </xsdOption> + </xsdOptions> + </configuration> + </execution> + </executions> </plugin> <plugin> Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/APIMessages.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptor.java Thu Jan 12 14:46:29 2012 @@ -50,15 +50,11 @@ public abstract class AbstractPolicyInte protected void getTransportAssertions(Message message) { Exchange ex = message.getExchange(); - Assertor assertor = null; Conduit conduit = ex.getConduit(message); - if (conduit instanceof Assertor) { - assertor = (Assertor)conduit; - } else { + Assertor assertor = PolicyUtils.createAsserter(conduit); + if (assertor == null) { Destination destination = ex.getDestination(); - if (destination instanceof Assertor) { - assertor = (Assertor)destination; - } + assertor = PolicyUtils.createAsserter(destination); } if (null != assertor) { assertor.assertMessage(message); Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AbstractPolicyInterceptorProvider.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AlternativeSelector.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderLoader.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionBuilderRegistry.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfo.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/Assertor.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/Assertor.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicy.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EffectivePolicyImpl.java Thu Jan 12 14:46:29 2012 @@ -119,7 +119,18 @@ public class EffectivePolicyImpl impleme chooseAlternative(engine, assertor); initialiseInterceptors(engine, false); } - + + private <T> T getAssertorAs(Assertor as, Class<T> t) { + if (t.isInstance(as)) { + return t.cast(as); + } else if (as instanceof PolicyUtils.WrappedAssertor) { + Object o = ((PolicyUtils.WrappedAssertor)as).getWrappedAssertor(); + if (t.isInstance(o)) { + return t.cast(o); + } + } + return null; + } Assertor initialisePolicy(EndpointInfo ei, BindingOperationInfo boi, PolicyEngineImpl engine, @@ -133,9 +144,9 @@ public class EffectivePolicyImpl impleme BindingMessageInfo bmi = request ? boi.getInput() : boi.getOutput(); EndpointPolicy ep; if (requestor) { - ep = engine.getClientEndpointPolicy(ei, (Conduit)assertor); + ep = engine.getClientEndpointPolicy(ei, getAssertorAs(assertor, Conduit.class)); } else { - ep = engine.getServerEndpointPolicy(ei, (Destination)assertor); + ep = engine.getServerEndpointPolicy(ei, getAssertorAs(assertor, Destination.class)); } policy = ep.getPolicy(); if (ep instanceof EndpointPolicyImpl) { Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/EndpointPolicy.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAssertion.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyBuilder.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyConstants.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngine.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java Thu Jan 12 14:46:29 2012 @@ -195,10 +195,7 @@ public class PolicyEngineImpl implements EffectivePolicy effectivePolicy = (EffectivePolicy)boi.getProperty(POLICY_INFO_REQUEST_CLIENT); if (null == effectivePolicy) { EffectivePolicyImpl epi = createOutPolicyInfo(); - Assertor assertor = null; - if (c instanceof Assertor) { - assertor = (Assertor)c; - } + Assertor assertor = PolicyUtils.createAsserter(c); epi.initialise(ei, boi, this, assertor, true, true); boi.setProperty(POLICY_INFO_REQUEST_CLIENT, epi); effectivePolicy = epi; @@ -219,10 +216,7 @@ public class PolicyEngineImpl implements EffectivePolicy effectivePolicy = (EffectivePolicy)boi.getProperty(POLICY_INFO_RESPONSE_SERVER); if (null == effectivePolicy) { EffectivePolicyImpl epi = createOutPolicyInfo(); - Assertor assertor = null; - if (d instanceof Assertor) { - assertor = (Assertor)d; - } + Assertor assertor = PolicyUtils.createAsserter(d); epi.initialise(ei, boi, this, assertor, false, false, incoming); boi.setProperty(POLICY_INFO_RESPONSE_SERVER, epi); effectivePolicy = epi; @@ -230,10 +224,7 @@ public class PolicyEngineImpl implements return effectivePolicy; } EffectivePolicyImpl epi = createOutPolicyInfo(); - Assertor assertor = null; - if (d instanceof Assertor) { - assertor = (Assertor)d; - } + Assertor assertor = PolicyUtils.createAsserter(d); epi.initialise(ei, boi, this, assertor, false, false, incoming); return epi; } @@ -250,10 +241,7 @@ public class PolicyEngineImpl implements if (bfi == null) { EffectivePolicyImpl epi = createOutPolicyInfo(); - Assertor assertor = null; - if (d instanceof Assertor) { - assertor = (Assertor)d; - } + Assertor assertor = PolicyUtils.createAsserter(d); epi.initialise(ei, boi, bfi, this, assertor); return epi; } @@ -261,10 +249,7 @@ public class PolicyEngineImpl implements EffectivePolicy effectivePolicy = (EffectivePolicy)bfi.getProperty(POLICY_INFO_FAULT_SERVER); if (null == effectivePolicy) { EffectivePolicyImpl epi = createOutPolicyInfo(); - Assertor assertor = null; - if (d instanceof Assertor) { - assertor = (Assertor)d; - } + Assertor assertor = PolicyUtils.createAsserter(d); epi.initialise(ei, boi, bfi, this, assertor); bfi.setProperty(POLICY_INFO_FAULT_SERVER, epi); effectivePolicy = epi; @@ -289,13 +274,12 @@ public class PolicyEngineImpl implements } public EndpointPolicy getClientEndpointPolicy(EndpointInfo ei, Conduit conduit) { - Assertor assertor = conduit instanceof Assertor ? (Assertor)conduit : null; + Assertor assertor = PolicyUtils.createAsserter(conduit); return getEndpointPolicy(ei, true, assertor); } public EndpointPolicy getServerEndpointPolicy(EndpointInfo ei, Destination destination) { - - Assertor assertor = destination instanceof Assertor ? (Assertor)destination : null; + Assertor assertor = PolicyUtils.createAsserter(destination); return getEndpointPolicy(ei, false, assertor); } Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyException.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyException.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyException.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProvider.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderLoader.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyInterceptorProviderRegistry.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyProvider.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyUtils.java Thu Jan 12 14:46:29 2012 @@ -24,8 +24,11 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.xml.namespace.QName; + import org.apache.cxf.common.util.SystemPropertyAction; import org.apache.cxf.helpers.CastUtils; +import org.apache.cxf.message.Message; import org.apache.neethi.Assertion; import org.apache.neethi.Constants; import org.apache.neethi.Policy; @@ -38,6 +41,27 @@ import org.apache.neethi.PolicyOperator; / public final class PolicyUtils { + public static class WrappedAssertor implements Assertor { + org.apache.cxf.transport.Assertor obj; + + public WrappedAssertor(org.apache.cxf.transport.Assertor o) { + obj = o; + } + + @Override + public void assertMessage(Message message) { + obj.assertMessage(message); + } + + @Override + public boolean canAssert(QName type) { + return obj.canAssert(type); + } + public org.apache.cxf.transport.Assertor getWrappedAssertor() { + return obj; + } + } + private static final String INDENT = " "; private PolicyUtils() { @@ -200,4 +224,14 @@ public final class PolicyUtils { return ""; } + public static Assertor createAsserter(Object o) { + if (o instanceof Assertor) { + return (Assertor)o; + } + if (o instanceof org.apache.cxf.transport.Assertor) { + return new WrappedAssertor((org.apache.cxf.transport.Assertor)o); + } + return null; + } + } Modified: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java?rev=1230568&r1=1230567&r2=1230568&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java (original) +++ cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyVerificationInInterceptor.java Thu Jan 12 14:46:29 2012 @@ -25,9 +25,9 @@ import java.util.logging.Logger; import javax.xml.namespace.QName; import org.apache.cxf.Bus; -import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.endpoint.Endpoint; +import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageUtils; @@ -106,9 +106,9 @@ public class PolicyVerificationInInterce //To check if there is ws addressing policy violation and throw WSA specific //exception to pass jaxws2.2 tests if (ex.getMessage().indexOf("Addressing") > -1) { - throw new SoapFault("A required header representing a Message Addressing Property " - + "is not present", - new QName("http://www.w3.org/2005/08/addressing", + throw new Fault("A required header representing a Message Addressing Property " + + "is not present", LOG) + .setFaultCode(new QName("http://www.w3.org/2005/08/addressing", "MessageAddressingHeaderRequired")); } throw ex; Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertion.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilder.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/jaxb/Messages.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/Messages.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertion.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java (from r1230255, cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java?p2=cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java&p1=cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/builder/primitive/PrimitiveAssertionBuilder.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java (from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java?p2=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/AssertionInfoMapTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java (from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java?p2=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionBuilderTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Copied: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java (from r1230255, cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java) URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java?p2=cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java&p1=cxf/trunk/api/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java&r1=1230255&r2=1230568&rev=1230568&view=diff ============================================================================== (empty) Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/builder/jaxb/JaxbAssertionTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date
Mime	Unnamed text/plain (inline, 7-Bit, 89611 bytes)
	View raw message