June 2015 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19801 - spi/branches.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-17 18:52:57 -0400 (Wed, 17 Jun 2015) New Revision: 19801 Removed: spi/branches/JBWS-3739/ Log: Deleting old branch

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19800 - spi/branches.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-17 18:52:36 -0400 (Wed, 17 Jun 2015) New Revision: 19800 Removed: spi/branches/JBWS-3797/ Log: Deleting old branch

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19799 - hudson/trunk/scripts.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-17 10:57:05 -0400 (Wed, 17 Jun 2015) New Revision: 19799 Modified: hudson/trunk/scripts/jbossws-qa.sh Log: [JBWS-3908] Tentative fix for restoring automatic generation of errata files Modified: hudson/trunk/scripts/jbossws-qa.sh =================================================================== --- hudson/trunk/scripts/jbossws-qa.sh 2015-06-17 14:02:19 UTC (rev 19798) +++ hudson/trunk/scripts/jbossws-qa.sh 2015-06-17 14:57:05 UTC (rev 19799) @@ -35,7 +35,8 @@ copyTestLogs() { cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt - cat $STACK_DIR/modules/dist/target/exclude-file/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt + cat $WORKSPACE/fixme.txt > $WORKSPACE/errata-$JBOSS_TARGET.txt + for i in `find $STACK_DIR -name surefire-reports`; do egrep -h "skipped message"\|FIXME $i/*|sort -u|sed 's/ <skipped message=\"//'|sed 's/\"\/>//' >> $WORKSPACE/errata-$JBOSS_TARGET.txt; done; } detectFailures() {

8 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-17 10:02:19 -0400 (Wed, 17 Jun 2015) New Revision: 19798 Modified: stack/cxf/trunk/README stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3923] Provide option for controlling Surefire console log redirect Modified: stack/cxf/trunk/README =================================================================== --- stack/cxf/trunk/README 2015-06-17 12:27:20 UTC (rev 19797) +++ stack/cxf/trunk/README 2015-06-17 14:02:19 UTC (rev 19798) @@ -15,6 +15,7 @@ The '-Djboss.bind.address=x.y.w.z' option can be used to have the started containers bound to the specified network interface address. The '-Dipv6' option can be used to run the integration testsuite using IPv6 protocol. The '-Darquillian.deploymentExportPath=target/foo' option can be used to have Arquillian write the actual test deployments to disk. +The '-DnoLogRedirect' can be used to prevent Surefire from redirecting console logs to test output files. The 'fast' profile can also be used to run tests concurrently; run 'mvn -Pfast,wildflyXYZ post-integration-test' in such case to trigger test servers' shutdown and save memory at the end of each testsuite module. Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2015-06-17 12:27:20 UTC (rev 19797) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2015-06-17 14:02:19 UTC (rev 19798) @@ -288,7 +288,6 @@ <skip>true</skip> <failIfNoTests>false</failIfNoTests> <runOrder>alphabetical</runOrder> - <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> <executions> <execution> @@ -525,6 +524,29 @@ </profile>  + <profile> + <id>logRedirect</id> + <activation> + <property> + <name>!noLogRedirect</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <redirectTestOutputToFile>true</redirectTestOutputToFile> + </configuration> + </plugin> + </plugins> + </build> + </profile> + +

8 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-17 08:27:20 -0400 (Wed, 17 Jun 2015) New Revision: 19797 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java Log: [JBWS-3922] Do not copy org.jboss.wsf.spi.deployment.Endpoint properties into CXF EndpointImpl Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-06-17 10:08:03 UTC (rev 19796) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2015-06-17 12:27:20 UTC (rev 19797) @@ -264,14 +264,6 @@ result.setEpClass(seiClass != null ? seiClass : sepClass); result.setPortName(new QName(serviceNS, portName)); result.setServiceName(new QName(serviceNS, serviceName)); - Map<String, Object> props = new HashMap<String, Object>(); - for (String k : ep.getProperties()) { - final Object v = ep.getProperty(k); - if (v != null) { //do not add null props [JBWS-3766] - props.put(k, v); - } - } - result.setProperties(props); if (annWsdlLocation.length() > 0) { result.setAnnotationWsdlLocation(annWsdlLocation); }

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19796 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: security/authentication and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-06-17 06:08:03 -0400 (Wed, 17 Jun 2015) New Revision: 19796 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationMgrSubjectCreatingInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java Log: [JBWS-3916]:Remove the workaround for JBWS-3843 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-06-17 08:28:00 UTC (rev 19795) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/JBossWSInvoker.java 2015-06-17 10:08:03 UTC (rev 19796) @@ -137,28 +137,7 @@ { throw Messages.MESSAGES.missingBindingOpeartionAndDispatchedMethod(); } - - //[JBWS-3843] workaround: set the CallbackHandler threadlocal again; as a matter of fact, if that's in the Exchange, - //DIGEST auth is being used and that will cause the EJB layer to re-do authentication because of the bug - CallbackHandler cbHandler = exchange.getInMessage().get(CallbackHandler.class); - Object obj = null; - try - { - if (cbHandler != null) - { - CallbackHandlerPolicyContextHandler.setCallbackHandler(cbHandler); - } - obj = invoke(exchange, targetBean, - adjustMethodAndParams(method, exchange, params, targetBean.getClass()), params); - } - finally - { - if (cbHandler != null) - { - CallbackHandlerPolicyContextHandler.setCallbackHandler(null); - } - } - return obj; + return invoke(exchange, targetBean, adjustMethodAndParams(md.getMethod(bop), exchange, params, targetBean.getClass()), params); } /** Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationMgrSubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationMgrSubjectCreatingInterceptor.java 2015-06-17 08:28:00 UTC (rev 19795) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/AuthenticationMgrSubjectCreatingInterceptor.java 2015-06-17 10:08:03 UTC (rev 19796) @@ -72,7 +72,7 @@ throw Messages.MESSAGES.unsupportedTokenType(token.getTokenType()); } UsernameToken ut = (UsernameToken) token; - subject = helper.createSubject(authenticationManger, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime(), message); + subject = helper.createSubject(authenticationManger, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime()); } else @@ -83,7 +83,7 @@ throw Messages.MESSAGES.couldNotGetSubjectInfo(); } UsernameTokenPrincipal up = (UsernameTokenPrincipal) p; - subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime(), message); + subject = helper.createSubject(authenticationManger, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime()); } Principal principal = getPrincipal(context.getUserPrincipal(), subject); Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2015-06-17 08:28:00 UTC (rev 19795) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2015-06-17 10:08:03 UTC (rev 19796) @@ -104,7 +104,7 @@ UsernameToken ut = (UsernameToken)token; Subject subject = createSubject(ut.getName(), ut.getPassword(), ut.isHashed(), - ut.getNonce(), ut.getCreatedTime(), msg); + ut.getNonce(), ut.getCreatedTime()); SecurityContext sc = doCreateSecurityContext(context.getUserPrincipal(), subject); msg.put(SecurityContext.class, sc); @@ -152,7 +152,7 @@ Subject subject = null; try { - subject = createSubject(name, password, isDigest, nonce, created, msg); + subject = createSubject(name, password, isDigest, nonce, created); } catch (Exception ex) { @@ -240,9 +240,9 @@ } - public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created, Message msg) + public Subject createSubject(String name, String password, boolean isDigest, String nonce, String created) { - return helper.createSubject(sdc.get(), name, password, isDigest, nonce, created, msg); + return helper.createSubject(sdc.get(), name, password, isDigest, nonce, created); } public void setPropagateContext(boolean propagateContext) Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2015-06-17 08:28:00 UTC (rev 19795) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2015-06-17 10:08:03 UTC (rev 19796) @@ -88,7 +88,7 @@ throw Messages.MESSAGES.unsupportedTokenType(token.getTokenType()); } UsernameToken ut = (UsernameToken) token; - subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime(), message); + subject = createSubject(sdc, ut.getName(), ut.getPassword(), ut.isHashed(), ut.getNonce(), ut.getCreatedTime()); } else @@ -99,19 +99,19 @@ throw Messages.MESSAGES.couldNotGetSubjectInfo(); } UsernameTokenPrincipal up = (UsernameTokenPrincipal) p; - subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime(), message); + subject = createSubject(sdc, up.getName(), up.getPassword(), up.isPasswordDigest(), up.getNonce(), up.getCreatedTime()); } Principal principal = getPrincipal(context.getUserPrincipal(), subject); message.put(SecurityContext.class, createSecurityContext(principal, subject)); } - protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime, Message msg) + protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, String nonce, String creationTime) { Subject subject = null; try { - subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime, msg); + subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime); } catch (Exception ex) { @@ -124,12 +124,12 @@ return subject; } - protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, byte[] nonce, String creationTime, Message msg) + protected Subject createSubject(SecurityDomainContext sdc, String name, String password, boolean isDigest, byte[] nonce, String creationTime) { Subject subject = null; try { - subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime, msg); + subject = helper.createSubject(sdc, name, password, isDigest, nonce, creationTime); } catch (Exception ex) { Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2015-06-17 08:28:00 UTC (rev 19795) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreator.java 2015-06-17 10:08:03 UTC (rev 19796) @@ -35,7 +35,6 @@ import javax.security.auth.callback.CallbackHandler; import org.apache.cxf.common.security.SimplePrincipal; -import org.apache.cxf.message.Message; import org.jboss.security.auth.callback.CallbackHandlerPolicyContextHandler; import org.jboss.security.plugins.JBossAuthenticationManager; import org.jboss.ws.common.utils.DelegateClassLoader; @@ -64,14 +63,14 @@ private boolean decodeNonce = true; - public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, byte[] nonce, String created, Message msg) + public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, byte[] nonce, String created) { //TODO, revisit final String sNonce = convertNonce(nonce); - return createSubject(ctx, name, password, isDigest, sNonce, created, msg); + return createSubject(ctx, name, password, isDigest, sNonce, created); } - public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, String nonce, String created, Message msg) + public Subject createSubject(SecurityDomainContext ctx, String name, String password, boolean isDigest, String nonce, String created) { if (isDigest) { @@ -84,7 +83,6 @@ CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce); CallbackHandlerPolicyContextHandler.setCallbackHandler(handler); - msg.put(CallbackHandler.class, handler); } // authenticate and populate Subject @@ -135,14 +133,14 @@ } return subject; } - public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, byte[] nonce, String created, Message msg) + public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, byte[] nonce, String created) { //TODO revisit final String sNonce = convertNonce(nonce); - return createSubject(manager, name, password, isDigest, sNonce, created, msg); + return createSubject(manager, name, password, isDigest, sNonce, created); } //TODO:refactor this - public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, String nonce, String created, Message msg) + public Subject createSubject(JBossAuthenticationManager manager, String name, String password, boolean isDigest, String nonce, String created) { if (isDigest) { @@ -155,7 +153,6 @@ CallbackHandler handler = new UsernameTokenCallbackHandler(nonce, created, decodeNonce); CallbackHandlerPolicyContextHandler.setCallbackHandler(handler); - msg.put(CallbackHandler.class, handler); } // authenticate and populate Subject

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19795 - in stack/cxf/trunk/modules/testsuite: cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-06-17 04:28:00 -0400 (Wed, 17 Jun 2015) New Revision: 19795 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml Log: Remove java.security.AllPermission in permission.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -76,7 +76,7 @@ public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf.impl\n")) + + "Dependencies: org.apache.cxf.impl,org.jboss.as.server \n")) .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Helper.class) Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -64,7 +64,8 @@ public static WebArchive createClientDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-schemavalidation-client.war"); archive - .addManifest() + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.as.server\n")) .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Hello.class) .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Helper.class) .addPackage("org.jboss.test.ws.jaxws.samples.schemavalidation.types") Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,14 +5,6 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> - </permission> -  -  + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> -  - -  + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -70,7 +70,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class, IN_CONTAINER_CLIENT_DEPLOYMENT + ".war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common\n")) + + "Dependencies: org.jboss.ws.common,org.jboss.as.server \n")) .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") .addClass(org.jboss.test.helper.ClientHelper.class) .addClass(org.jboss.test.helper.TestServlet.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -65,7 +65,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class, INCONTAINER_CLIENT + ".war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.jboss.as.server \n")) .addClass(org.jboss.test.ws.jaxws.jbws3282.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws3282.Helper.class) .addClass(org.jboss.test.ws.jaxws.jbws3282.TestUtils.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -83,7 +83,7 @@ WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-samples-eardeployment-pojo.war"); archive2 .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging,org.jboss.ws.common\n")) + + "Dependencies: org.jboss.logging,org.jboss.ws.common,org.jboss.as.server\n")) .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean.class) .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml"), "jboss-web.xml") @@ -93,7 +93,8 @@ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-eardeployment.ear"); archive - .addManifest() + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.as.server\n")) .addAsModule(archive1) .addAsModule(archive2) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/META-INF/permissions.xml"), "permissions.xml"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -54,7 +54,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class,"endpoint-publish.war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common\n")) + + "Dependencies: org.jboss.ws.common,org.jboss.as.server \n")) .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml", "WEB-INF/wsdl/EndpointImpl3.xml") .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml", "WEB-INF/wsdl/EndpointImpl4.xml") .addClass(org.jboss.test.ws.publish.Endpoint.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> -  - -  + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> -  - -  + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> -  - -  + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,14 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> -  - -  + <actions>read,write,delete</actions> + </permission> </permissions>

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19794 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: interceptor and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-16 18:24:17 -0400 (Tue, 16 Jun 2015) New Revision: 19794 Removed: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java Log: [JBWS-3921] Get rid of unrequired MessagePropertySettingInterceptor Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-06-16 22:07:37 UTC (rev 19793) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-06-16 22:24:17 UTC (rev 19794) @@ -71,7 +71,6 @@ import org.jboss.wsf.stack.cxf.client.configuration.InterceptorUtils; import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher; import org.jboss.wsf.stack.cxf.extensions.policy.PolicySetsAnnotationListener; -import org.jboss.wsf.stack.cxf.interceptor.MessagePropertySettingInterceptor; import org.jboss.wsf.stack.cxf.interceptor.EndpointAssociationInterceptor; import org.jboss.wsf.stack.cxf.interceptor.HandlerAuthInterceptor; import org.jboss.wsf.stack.cxf.interceptor.NsCtxSelectorStoreInterceptor; @@ -168,6 +167,9 @@ //(moreover the user can tune the web container thread pool instead of expecting cxf to fork new threads) bus.setProperty(OneWayProcessorInterceptor.USE_ORIGINAL_THREAD, true); + //[JBWS-3135] enable decoupled faultTo. This is an optional feature in cxf and we need this to be default to make it same behavior with native stack + bus.setProperty("org.apache.cxf.ws.addressing.decoupled_fault_support", true); + FeatureUtils.addFeatures(bus, bus, props); } @@ -213,7 +215,6 @@ //Install the EndpointAssociationInterceptor for linking every message exchange //with the proper spi Endpoint retrieved in CXFServletExt bus.getInInterceptors().add(new EndpointAssociationInterceptor()); - bus.getInInterceptors().add(new MessagePropertySettingInterceptor()); bus.getInInterceptors().add(new NsCtxSelectorStoreInterceptor()); final String p = (props != null) ? props.get(Constants.JBWS_CXF_DISABLE_HANDLER_AUTH_CHECKS) : null; Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 22:07:37 UTC (rev 19793) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 22:24:17 UTC (rev 19794) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.interceptor; - -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.AbstractPhaseInterceptor; -import org.apache.cxf.phase.Phase; -import org.apache.cxf.ws.addressing.soap.MAPCodec; - -/** - * This interceptor adds the following context properties to cxf message: - * 1.decoupled_fault_support - * It enables decoupled faultTo. This is an optional feature in cxf and we - * need this to be default to make it same behavior with native stack. - * @author <a href="mailto:ema@redhat.com">Jim Ma</a> - */ -public class MessagePropertySettingInterceptor extends AbstractPhaseInterceptor<Message> -{ - - public MessagePropertySettingInterceptor() - { - super(Phase.PRE_PROTOCOL); - addBefore(MAPCodec.class.getName()); - } - - public void handleMessage(Message message) - { - message.put("org.apache.cxf.ws.addressing.decoupled_fault_support", true); - } - - public void handleFault(Message message) - { - //complete - } -}

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19793 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: interceptor and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-06-16 18:07:37 -0400 (Tue, 16 Jun 2015) New Revision: 19793 Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java Log: [JBWS-3920] Default to OneWayProcessorInterceptor.USE_ORIGINAL_THREAD = true Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-06-16 03:15:03 UTC (rev 19792) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2015-06-16 22:07:37 UTC (rev 19793) @@ -33,6 +33,7 @@ import org.apache.cxf.buslifecycle.BusLifeCycleManager; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.endpoint.ServerLifeCycleManager; +import org.apache.cxf.interceptor.OneWayProcessorInterceptor; import org.apache.cxf.management.InstrumentationManager; import org.apache.cxf.management.counters.CounterRepository; import org.apache.cxf.management.interceptor.ResponseTimeMessageInInterceptor; @@ -161,6 +162,12 @@ bus.getExtension(FactoryBeanListenerManager.class).addListener(policySetsListener); } + //default to USE_ORIGINAL_THREAD = true; this can be overridden by simply setting the property in the endpoint or in the message using an interceptor + //this forces one way operation to use original thread, which is required for ejb webserivce endpoints to avoid authorization failures from ejb container + //and is a performance improvement in general when running in-container, as CXF needs to cache the message to free the thread, which is expensive + //(moreover the user can tune the web container thread pool instead of expecting cxf to fork new threads) + bus.setProperty(OneWayProcessorInterceptor.USE_ORIGINAL_THREAD, true); + FeatureUtils.addFeatures(bus, bus, props); } Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 03:15:03 UTC (rev 19792) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/interceptor/MessagePropertySettingInterceptor.java 2015-06-16 22:07:37 UTC (rev 19793) @@ -21,28 +21,20 @@ */ package org.jboss.wsf.stack.cxf.interceptor; -import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.interceptor.OneWayProcessorInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.ws.addressing.soap.MAPCodec; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.EndpointType; /** * This interceptor adds the following context properties to cxf message: * 1.decoupled_fault_support * It enables decoupled faultTo. This is an optional feature in cxf and we * need this to be default to make it same behavior with native stack. - * 2.OneWayProcessorInterceptor.USE_ORIGINAL_THREAD - * This will force one way operation to use original thread for ejb webserivce endpoint - * to avoid authorization failure from ejb container * @author <a href="mailto:ema@redhat.com">Jim Ma</a> */ public class MessagePropertySettingInterceptor extends AbstractPhaseInterceptor<Message> { - private static EjbWSOneWayThreadInterceptor ejbOneWayInterceptor = new EjbWSOneWayThreadInterceptor(); public MessagePropertySettingInterceptor() { @@ -53,38 +45,10 @@ public void handleMessage(Message message) { message.put("org.apache.cxf.ws.addressing.decoupled_fault_support", true); - message.getInterceptorChain().add(ejbOneWayInterceptor); } public void handleFault(Message message) { //complete } - - private static class EjbWSOneWayThreadInterceptor extends AbstractPhaseInterceptor<Message> - { - public EjbWSOneWayThreadInterceptor() - { - super(Phase.PRE_LOGICAL); - this.addBefore(OneWayProcessorInterceptor.class.getName()); - } - - @Override - public void handleMessage(Message message) throws Fault - { - - Endpoint endpoint = message.getExchange().get(Endpoint.class); - if (endpoint == null) - { - return; - } - //Use original thread for oneway message to avoid authorization failure in ejb container for webservice endpoint - if (endpoint.getType() == EndpointType.JAXWS_EJB3 && message.getExchange().isOneWay() && !isRequestor(message)) - { - message.put(OneWayProcessorInterceptor.USE_ORIGINAL_THREAD, true); - } - - } - } - }

8 years, 10 months

1
0
0 / 0

JBossWS SVN: r19792 - in stack/cxf/trunk/modules/testsuite: shared-tests/src/test/resources/jaxws/samples/logicalhandler/WEB-INF and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-06-15 23:15:03 -0400 (Mon, 15 Jun 2015) New Revision: 19792 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/logicalhandler/WEB-INF/permissions.xml Log: Fix permission failures Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-15 07:14:59 UTC (rev 19791) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-16 03:15:03 UTC (rev 19792) @@ -5,7 +5,41 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> + <class-name>java.security.AllPermission</class-name> + </permission> +  + +  </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/logicalhandler/WEB-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/logicalhandler/WEB-INF/permissions.xml 2015-06-15 07:14:59 UTC (rev 19791) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/logicalhandler/WEB-INF/permissions.xml 2015-06-16 03:15:03 UTC (rev 19792) @@ -5,6 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> + <class-name>java.lang.RuntimePermission</class-name> + <name>accessDeclaredMembers</name> + </permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions>

8 years, 10 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 June 2015