July 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17787 - container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-16 10:13:22 -0400 (Tue, 16 Jul 2013) New Revision: 17787 Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java Log: [JBWS-3659] Removing JBWS-3441 hack and setting InvocationHandler using an additional DA Modified: container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java =================================================================== --- container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 13:59:32 UTC (rev 17786) +++ container/jboss71/branches/jbossws-jboss713/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 14:13:22 UTC (rev 17787) @@ -52,6 +52,9 @@ import org.jboss.metadata.web.spec.ServletMappingMetaData; import org.jboss.msc.service.ServiceTarget; import org.jboss.ws.common.deployment.DeploymentAspectManagerImpl; +import org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; +import org.jboss.ws.common.invocation.InvocationHandlerJAXWS; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; @@ -73,6 +76,7 @@ private Host host; private boolean runningInService = false; + private static List<DeploymentAspect> publisherDepAspects = null; private static List<DeploymentAspect> depAspects = null; public EndpointPublisherImpl(Host host) { @@ -241,28 +245,64 @@ } private List<DeploymentAspect> getDeploymentAspects() { - return runningInService ? DeploymentAspectsProvider.getSortedDeploymentAspects() : getPublisherDeploymentAspects(); + return runningInService ? getReplacedDeploymentAspects() : getPublisherDeploymentAspects(); } - private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() { + private static synchronized List<DeploymentAspect> getReplacedDeploymentAspects() { if (depAspects == null) { depAspects = new LinkedList<DeploymentAspect>(); - final List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); + List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); + for (DeploymentAspect aspect : serverAspects) { + if(aspect instanceof EndpointHandlerDeploymentAspect) { + depAspects.add(aspect); + //add another aspect to set InvocationHandlerJAXWS to each endpoint + ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); + handlerAspect.setForJaxRpc(false); + depAspects.add(handlerAspect); + } else { + depAspects.add(aspect); + } + } + } + return depAspects; + } + + private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() { + if (publisherDepAspects == null) { + publisherDepAspects = new LinkedList<DeploymentAspect>(); //copy to replace the EndpointServiceDeploymentAspect + List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); for (DeploymentAspect aspect : serverAspects) { if (aspect instanceof EndpointServiceDeploymentAspect) { final EndpointServiceDeploymentAspect a = (EndpointServiceDeploymentAspect)aspect; EndpointServiceDeploymentAspect clone = (EndpointServiceDeploymentAspect)(a.clone()); clone.setStopServices(true); - depAspects.add(clone); + publisherDepAspects.add(clone); + } else if(aspect instanceof EndpointHandlerDeploymentAspect) { + publisherDepAspects.add(aspect); + //add another aspect to set InvocationHandlerJAXWS to each endpoint + ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); + handlerAspect.setForJaxRpc(false); + publisherDepAspects.add(handlerAspect); } else { - depAspects.add(aspect); + publisherDepAspects.add(aspect); } } } - return depAspects; + return publisherDepAspects; } + static class ForceJAXWSInvocationHandlerDeploymentAspect extends AbstractDeploymentAspect { + public ForceJAXWSInvocationHandlerDeploymentAspect() { + } + @Override + public void start(final Deployment dep) { + for (final Endpoint ep : dep.getService().getEndpoints()) { + ep.setInvocationHandler(new InvocationHandlerJAXWS()); + } + } + } + private static class LocalInstanceManager implements InstanceManager { LocalInstanceManager() { }

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17786 - container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-16 09:59:32 -0400 (Tue, 16 Jul 2013) New Revision: 17786 Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java Log: [JBWS-3660] Always stop endpoint through lifecycle handler Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java =================================================================== --- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 13:47:50 UTC (rev 17785) +++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2013-07-16 13:59:32 UTC (rev 17786) @@ -53,13 +53,14 @@ @Override public void stop(Deployment dep) { - if (stopServices) { - final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class); - for (final Endpoint ep : dep.getService().getEndpoints()) { + for (final Endpoint ep : dep.getService().getEndpoints()) { + if (ep.getLifecycleHandler() != null) { + ep.getLifecycleHandler().stop(ep); + } + if (stopServices) { + final DeploymentUnit unit = getRequiredAttachment(dep, DeploymentUnit.class); EndpointService.uninstall(ep, unit); } - } else { - super.stop(dep); } }

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17785 - container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-16 09:47:50 -0400 (Tue, 16 Jul 2013) New Revision: 17785 Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java Log: [JBWS-3659] Removing JBWS-3441 hack and setting InvocationHandler using an additional DA Modified: container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java =================================================================== --- container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 09:59:24 UTC (rev 17784) +++ container/jboss72/branches/jbossws-jboss720/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2013-07-16 13:47:50 UTC (rev 17785) @@ -52,13 +52,14 @@ import org.jboss.metadata.web.spec.ServletMappingMetaData; import org.jboss.msc.service.ServiceTarget; import org.jboss.ws.common.deployment.DeploymentAspectManagerImpl; +import org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect; +import org.jboss.ws.common.integration.AbstractDeploymentAspect; import org.jboss.ws.common.invocation.InvocationHandlerJAXWS; import org.jboss.wsf.spi.classloading.ClassLoaderProvider; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointState; import org.jboss.wsf.spi.deployment.WSFServlet; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; @@ -75,6 +76,7 @@ private Host host; private boolean runningInService = false; + private static List<DeploymentAspect> publisherDepAspects = null; private static List<DeploymentAspect> depAspects = null; public EndpointPublisherImpl(Host host) { @@ -128,14 +130,6 @@ DeploymentAspectManager dam = new DeploymentAspectManagerImpl(); dam.setDeploymentAspects(aspects); dam.deploy(dep); - // [JBWS-3441] hack - fallback JAXWS invocation handler for dynamically generated deployments - for (Endpoint ep : dep.getService().getEndpoints()) { - synchronized (ep) { - ep.setState(EndpointState.STOPPED); - ep.setInvocationHandler(new InvocationHandlerJAXWS()); - ep.setState(EndpointState.STARTED); - } - } } finally { if (dep != null) { dep.removeAttachment(ServiceTarget.class); @@ -249,28 +243,64 @@ } private List<DeploymentAspect> getDeploymentAspects() { - return runningInService ? DeploymentAspectsProvider.getSortedDeploymentAspects() : getPublisherDeploymentAspects(); + return runningInService ? getReplacedDeploymentAspects() : getPublisherDeploymentAspects(); } - private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() { + private static synchronized List<DeploymentAspect> getReplacedDeploymentAspects() { if (depAspects == null) { depAspects = new LinkedList<DeploymentAspect>(); - final List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); + List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); + for (DeploymentAspect aspect : serverAspects) { + if(aspect instanceof EndpointHandlerDeploymentAspect) { + depAspects.add(aspect); + //add another aspect to set InvocationHandlerJAXWS to each endpoint + ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); + handlerAspect.setForJaxRpc(false); + depAspects.add(handlerAspect); + } else { + depAspects.add(aspect); + } + } + } + return depAspects; + } + + private static synchronized List<DeploymentAspect> getPublisherDeploymentAspects() { + if (publisherDepAspects == null) { + publisherDepAspects = new LinkedList<DeploymentAspect>(); // copy to replace the EndpointServiceDeploymentAspect + List<DeploymentAspect> serverAspects = DeploymentAspectsProvider.getSortedDeploymentAspects(); for (DeploymentAspect aspect : serverAspects) { if (aspect instanceof EndpointServiceDeploymentAspect) { final EndpointServiceDeploymentAspect a = (EndpointServiceDeploymentAspect) aspect; EndpointServiceDeploymentAspect clone = (EndpointServiceDeploymentAspect) (a.clone()); clone.setStopServices(true); - depAspects.add(clone); + publisherDepAspects.add(clone); + } else if(aspect instanceof EndpointHandlerDeploymentAspect) { + publisherDepAspects.add(aspect); + //add another aspect to set InvocationHandlerJAXWS to each endpoint + ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); + handlerAspect.setForJaxRpc(false); + publisherDepAspects.add(handlerAspect); } else { - depAspects.add(aspect); + publisherDepAspects.add(aspect); } } } - return depAspects; + return publisherDepAspects; } + static class ForceJAXWSInvocationHandlerDeploymentAspect extends AbstractDeploymentAspect { + public ForceJAXWSInvocationHandlerDeploymentAspect() { + } + @Override + public void start(final Deployment dep) { + for (final Endpoint ep : dep.getService().getEndpoints()) { + ep.setInvocationHandler(new InvocationHandlerJAXWS()); + } + } + } + private static class LocalInstanceManager implements InstanceManager { LocalInstanceManager() { }

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17784 - in stack/cxf/trunk: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-16 05:59:24 -0400 (Tue, 16 Jul 2013) New Revision: 17784 Modified: stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3665] Upgrade to PicketLink 2.1.7.Final Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-15 23:36:59 UTC (rev 17783) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-07-16 09:59:24 UTC (rev 17784) @@ -862,9 +862,6 @@  <exclude>org/jboss/test/ws/jaxws/cxf/httpauth/HelloDigestTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> </excludes> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-07-15 23:36:59 UTC (rev 17783) +++ stack/cxf/trunk/pom.xml 2013-07-16 09:59:24 UTC (rev 17784) @@ -80,8 +80,8 @@ <jboss-logging-processor.version>1.0.3.Final</jboss-logging-processor.version> <jboss.jandex.version>1.0.3.Final</jboss.jandex.version> <jboss.xb.version>2.0.3.GA</jboss.xb.version> - <picketbox.version>4.0.9.Final</picketbox.version> - <picketlink.version>2.1.4.Final</picketlink.version> + <picketbox.version>4.0.17.Final</picketbox.version> + <picketlink.version>2.1.7.Final</picketlink.version> <jaxws-jboss-httpserver-httpspi.version>1.0.1.GA</jaxws-jboss-httpserver-httpspi.version> <httpserver.version>1.0.0.Final</httpserver.version> <jaxb.api.version>1.0.3.Final</jaxb.api.version>

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17783 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-15 19:36:59 -0400 (Mon, 15 Jul 2013) New Revision: 17783 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl Log: Use GCM 256 algorithm, as the 192bit version is disallowed by BSP Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2013-07-15 23:31:28 UTC (rev 17782) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/basic/gcm/WEB-INF/wsdl/SecurityService.wsdl 2013-07-15 23:36:59 UTC (rev 17783) @@ -78,7 +78,7 @@ <sp:OnlySignEntireHeadersAndBody/> <sp:AlgorithmSuite> <wsp:Policy> - <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> + <sp-cxf:Basic256GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> </wsp:Policy> </sp:AlgorithmSuite> </wsp:Policy>

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17782 - in stack/cxf/trunk/modules: testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-15 19:31:28 -0400 (Mon, 15 Jul 2013) New Revision: 17782 Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml Removed: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java Log: [JBWS-3648] Use GCM 256 algorithm, as the 192bit version is disallowed by BSP Deleted: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:31:28 UTC (rev 17782) @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy" - xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." - xmlns:wsp="http://www.w3.org/ns/ws-policy" - xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"> - <wsp:ExactlyOne> - <wsp:All> - <sp:AsymmetricBinding> - <wsp:Policy> - <sp:InitiatorToken> - <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:InitiatorToken> - <sp:RecipientToken> - <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> - <wsp:Policy> - <sp:WssX509V1Token11/> - </wsp:Policy> - </sp:X509Token> - </wsp:Policy> - </sp:RecipientToken> - <sp:Layout> - <wsp:Policy> - <sp:Lax/> - </wsp:Policy> - </sp:Layout> - <sp:IncludeTimestamp/> - <sp:ProtectTokens/> - <sp:OnlySignEntireHeadersAndBody/> - <sp:AlgorithmSuite> - <wsp:Policy> - <sp-cxf:Basic192GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> - </wsp:Policy> - </sp:AlgorithmSuite> - </wsp:Policy> - </sp:AsymmetricBinding> - <sp:SignedParts> - <sp:Body/> - </sp:SignedParts> - <sp:EncryptedParts> - <sp:Body/> - </sp:EncryptedParts> - <sp:Wss10> - <wsp:Policy> - <sp:MustSupportRefIssuerSerial/> - </wsp:Policy> - </sp:Wss10> - </wsp:All> - </wsp:ExactlyOne> -</wsp:Policy> \ No newline at end of file Added: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml (rev 0) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens-BINDING.xml 2013-07-15 23:31:28 UTC (rev 17782) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsp:Policy wsu:Id="AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..." + xmlns:wsp="http://www.w3.org/ns/ws-policy" + xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Al..."> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never"> + <wsp:Policy> + <sp:WssX509V1Token11/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:Layout> + <wsp:Policy> + <sp:Lax/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:ProtectTokens/> + <sp:OnlySignEntireHeadersAndBody/> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp-cxf:Basic256GCM xmlns:sp-cxf="http://cxf.apache.org/custom/security-policy"/> + </wsp:Policy> + </sp:AlgorithmSuite> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:SignedParts> + <sp:Body/> + </sp:SignedParts> + <sp:EncryptedParts> + <sp:Body/> + </sp:EncryptedParts> + <sp:Wss10> + <wsp:Policy> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + </wsp:All> + </wsp:ExactlyOne> +</wsp:Policy> \ No newline at end of file Modified: stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore =================================================================== --- stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/client/src/main/resources/META-INF/policies/org.jboss.wsf.stack.cxf.extensions.policy.PolicyAttachmentStore 2013-07-15 23:31:28 UTC (rev 17782) @@ -1,5 +1,5 @@ AsymmetricBinding_X509v1_TripleDesRsa15_EncryptBeforeSigning_ProtectTokens -AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens +AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens WS-SP-EX221_WSS10_Mutual_Auth_X509_Sign_Encrypt WS-SP-EX222_WSS10_Mutual_Auth_X509_Sign_Encrypt WS-SP-EX223_WSS11_Anonymous_X509_Sign_Encrypt Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedServiceImpl.java 2013-07-15 23:31:28 UTC (rev 17782) @@ -42,7 +42,7 @@ @EndpointProperty(key = "ws-security.callback-handler", value = "org.jboss.test.ws.jaxws.samples.wsse.policy.basic.KeystorePasswordCallback") } ) -@PolicySets("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens") +@PolicySets("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens") public class AnnotatedServiceImpl implements AnnotatedServiceIface { public String sayHello() Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2013-07-15 23:28:02 UTC (rev 17781) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/basic/AnnotatedSignEncryptTestCase.java 2013-07-15 23:31:28 UTC (rev 17782) @@ -64,7 +64,7 @@ br.close(); } String wsdl = sb.toString(); - assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM192OAEP_ProtectTokens_binding_policy")); + assertTrue(wsdl.contains("AsymmetricBinding_X509v1_GCM256OAEP_ProtectTokens_binding_policy")); } public void test() throws Exception

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17781 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-07-15 19:28:02 -0400 (Mon, 15 Jul 2013) New Revision: 17781 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java Log: Apache CXF 2.7.6+ has additional getBus() abstract method in AbstractHTTPServlet... Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2013-07-15 13:53:10 UTC (rev 17780) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/CXFServletExt.java 2013-07-15 23:28:02 UTC (rev 17781) @@ -141,4 +141,9 @@ // filtering not supported, move on chain.doFilter(request, response); } + + protected Bus getBus() + { + return bus; + } }

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17780 - in thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports: http-jetty/src/main/java/org/apache/cxf/transport/http_jetty and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2013-07-15 09:53:10 -0400 (Mon, 15 Jul 2013) New Revision: 17780 Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Log: [BZ984470] Merged in CXF-5116 Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java =================================================================== --- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java 2013-07-15 10:37:16 UTC (rev 17779) +++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java 2013-07-15 13:53:10 UTC (rev 17780) @@ -217,14 +217,14 @@ if (inMessage == null) { LOG.fine("Create a new message for processing"); inMessage = new MessageImpl(); + ExchangeImpl exchange = new ExchangeImpl(); + exchange.setInMessage(inMessage); setupMessage(inMessage, config, context, req, resp); - ExchangeImpl exchange = new ExchangeImpl(); - exchange.setInMessage(inMessage); exchange.setSession(new HTTPSession(req)); ((MessageImpl)inMessage).setDestination(this); } else { @@ -265,13 +265,15 @@ req, resp); + final Exchange exchange = inMessage.getExchange(); DelegatingInputStream in = new DelegatingInputStream(req.getInputStream()) { public void cacheInput() { - if (!cached && inMessage.getExchange().getOutMessage() == null) { + if (!cached && exchange.isOneWay()) { //For one-ways, we need to cache the values of the HttpServletRequest //so they can be queried later for things like paths and schemes //and such like that. - inMessage.put(HTTP_REQUEST, new HttpServletRequestSnapshot(req)); + //Please note, exchange used to always get the "current" message + exchange.getInMessage().put(HTTP_REQUEST, new HttpServletRequestSnapshot(req)); } super.cacheInput(); } Modified: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java =================================================================== --- thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java 2013-07-15 10:37:16 UTC (rev 17779) +++ thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java 2013-07-15 13:53:10 UTC (rev 17780) @@ -335,12 +335,12 @@ if (inMessage == null) { inMessage = new MessageImpl(); + ExchangeImpl exchange = new ExchangeImpl(); + exchange.setInMessage(inMessage); setupMessage(inMessage, context, req, resp); ((MessageImpl)inMessage).setDestination(this); - ExchangeImpl exchange = new ExchangeImpl(); - exchange.setInMessage(inMessage); exchange.setSession(new HTTPSession(req)); }

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17779 - thirdparty/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2013-07-15 06:37:16 -0400 (Mon, 15 Jul 2013) New Revision: 17779 Added: thirdparty/cxf/branches/cxf-2.6.6.jbossorg-1-bz-984470/ Log: [BZ-984470] Create one off patch branch

10 years, 9 months

1
0
0 / 0

JBossWS SVN: r17778 - in projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa: test1198 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: rsvoboda(a)redhat.com Date: 2013-07-15 04:55:13 -0400 (Mon, 15 Jul 2013) New Revision: 17778 Modified: projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1197/Test1197TestCase.java projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1198/SignatureRpcLiteralImpl.java Log: bp12-tests - fix for Test1197 and Test1198 Modified: projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1197/Test1197TestCase.java =================================================================== --- projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1197/Test1197TestCase.java 2013-07-12 13:16:57 UTC (rev 17777) +++ projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1197/Test1197TestCase.java 2013-07-15 08:55:13 UTC (rev 17778) @@ -92,7 +92,7 @@ headerText.value = "Hello"; try { - port.sign1("world"); + port.sign7("World", headerText); fail("Exception is expected."); } catch (Exception e) Modified: projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1198/SignatureRpcLiteralImpl.java =================================================================== --- projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1198/SignatureRpcLiteralImpl.java 2013-07-12 13:16:57 UTC (rev 17777) +++ projects/wsi-bp-test/trunk/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/wsa/test1198/SignatureRpcLiteralImpl.java 2013-07-15 08:55:13 UTC (rev 17778) @@ -41,7 +41,7 @@ { if (parameter1.equals("Fault")) { - new SignatureRpcLiteralSign2SignatureHeaderRpcFaultFaultMessage("Fault : " + parameter1 + "," + parameter2); + throw new SignatureRpcLiteralSign2SignatureHeaderRpcFaultFaultMessage("Fault : " + parameter1 + "," + parameter2); } return "Sign2, Parameter=" + parameter1 + ",Parameter=" + parameter2; }

10 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2013