August 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17890 - in stack/cxf/trunk/modules/testsuite/cxf-spring-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-27 10:17:08 -0400 (Tue, 27 Aug 2013) New Revision: 17890 Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl Log: [JBWS-3698] Use HTTP Upgrade for remote connection factory JNDI on WFLY Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2013-08-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2013-08-27 14:17:08 UTC (rev 17890) @@ -154,26 +154,39 @@ </war>  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war" + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> </classes> <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF/wsdl" prefix="WEB-INF/classes/META-INF/wsdl"/> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> </manifest> </war> +  + <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment-as7.jar"> + <fileset dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> + </fileset> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> + <include name="wsdl/**/*" /> + </metainf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </jar> +  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7"> + <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF"> <include name="wsdl/**/*" /> </metainf> <manifest> @@ -181,6 +194,20 @@ </manifest> </jar> +  + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment-as7.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HelloWorld*.class"/> + <include name="org/jboss/test/ws/jaxws/cxf/jms_http/HttpHelloWorld*.class"/> + </classes> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF-as7"> + <include name="wsdl/**"/> + </webinf> + <manifest> + <attribute name="Dependencies" value="org.hornetq"/> + </manifest> + </war> +  <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-http-deployment.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/jms_http/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -203,7 +230,7 @@ <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld.class"/> </classes> <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as7/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF/wsdl" prefix="WEB-INF/classes/META-INF/wsdl"/> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-client services,org.hornetq"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2013-08-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCaseForked.java 2013-08-27 14:17:08 UTC (rev 17890) @@ -63,7 +63,8 @@ public static Test suite() { - return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war,jaxws-cxf-jms-only-deployment.jar"); + return new JBossWSCXFTestSetup(JMSEndpointOnlyDeploymentTestCaseForked.class, "jaxws-cxf-jms-only-deployment-test-servlet.war, " + + (isTargetJBoss7() ? "jaxws-cxf-jms-only-deployment-as7.jar" : "jaxws-cxf-jms-only-deployment.jar")); } public void testJMSEndpointServerSide() throws Exception @@ -75,7 +76,8 @@ public void testJMSEndpointClientSide() throws Exception { - URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF-as7/wsdl/HelloWorldService.wsdl"); + final String suffix = isTargetJBoss7() ? "-as7" : ""; + URL wsdlUrl = getResourceURL("jaxws/cxf/jms/META-INF" + suffix + "/wsdl/HelloWorldService.wsdl"); QName serviceName = new QName("http://org.jboss.ws/jaxws/cxf/jms", "HelloWorldService"); Service service = Service.create(wsdlUrl, serviceName); @@ -110,7 +112,7 @@ Properties env = new Properties(); env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jboss.naming.remote.client.InitialContextFactory"); - env.put(Context.PROVIDER_URL, "remote://" + getServerHost() + ":4447"); + env.put(Context.PROVIDER_URL, "http-remoting://" + getServerHost() + ":8080"); env.put(Context.SECURITY_PRINCIPAL, JBossWSTestHelper.getTestUsername()); env.put(Context.SECURITY_CREDENTIALS, JBossWSTestHelper.getTestPassword()); InitialContext context = null; Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2013-08-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCaseForked.java 2013-08-27 14:17:08 UTC (rev 17890) @@ -50,7 +50,8 @@ { public static Test suite() { - return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, "jaxws-cxf-jms-http-deployment-test-servlet.war,jaxws-cxf-jms-http-deployment.war"); + return new JBossWSCXFTestSetup(JMSHTTPEndpointDeploymentTestCaseForked.class, "jaxws-cxf-jms-http-deployment-test-servlet.war," + + (isTargetJBoss7() ? "jaxws-cxf-jms-http-deployment-as7.war" : "jaxws-cxf-jms-http-deployment.war")); } public void testJMSEndpointServerSide() throws Exception Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF/wsdl/HelloWorldService.wsdl ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2013-08-23 16:59:25 UTC (rev 17889) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF/wsdl/HelloWorldService.wsdl 2013-08-27 14:17:08 UTC (rev 17890) @@ -65,7 +65,7 @@ <wsdl:service name="HelloWorldService"> <soapjms:jndiConnectionFactoryName>java:jms/RemoteConnectionFactory</soapjms:jndiConnectionFactoryName> <soapjms:jndiInitialContextFactory>org.jboss.naming.remote.client.InitialContextFactory</soapjms:jndiInitialContextFactory> - <soapjms:jndiURL>remote://@jboss.bind.address@:4447</soapjms:jndiURL> + <soapjms:jndiURL>http-remoting://@jboss.bind.address@:8080</soapjms:jndiURL> <wsdl:port binding="tns:HelloWorldServiceSoapBinding" name="HelloWorldImplPort"> <soap:address location="jms:queue:testQueue"/> </wsdl:port> Added: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl =================================================================== (Binary files differ) Property changes on: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms_http/WEB-INF-as7/wsdl/HelloWorldService.wsdl ___________________________________________________________________ Added: svn:mime-type + application/xml

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17889 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-23 12:59:25 -0400 (Fri, 23 Aug 2013) New Revision: 17889 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java Log: [JBWS-3697] Fixing WSConsume failures w/ OpenJDK 6 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-08-23 13:04:19 UTC (rev 17888) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/tools/CXFConsumerImpl.java 2013-08-23 16:59:25 UTC (rev 17889) @@ -414,7 +414,7 @@ final JavaFileObject obj = it.next(); final String objName = obj.getName(); Class<?> clazz = null; - final String className = packageName + "." + objName.substring(0, objName.length() - 6); + final String className = getFullClassName(packageName, objName); try { clazz = classLoader.loadClass(className); @@ -453,6 +453,24 @@ return files; } } + + private static String getFullClassName(String packageName, String objName) + { + // * OpenJDK returns objName strings like: + // "/usr/java/java-1.6.0-openjdk-1.6.0.0.x86_64/lib/ct.sym(META-INF/sym/rt.jar/java/lang/AbstractMethodError.class)" + // * Oracle & IBM JDK return objName strings like: + // "AbstractMethodError.class" + // ... from either of those we need to get + // "java.lang.AbstractMethodError" + String cn = objName.substring(0, objName.indexOf(".class")); + int startIdx = Math.max(cn.lastIndexOf("."), cn.lastIndexOf("/")); + if (startIdx > 0) + { + cn = cn.substring(startIdx + 1); + } + // objName.substring(0, objName.length() - 6) + return packageName + "." + cn; + } final class JavaFileObjectImpl extends SimpleJavaFileObject {

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17888 - stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-23 09:04:19 -0400 (Fri, 23 Aug 2013) New Revision: 17888 Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java Log: [JBWS-3696] Make AppclientHelper timeout configurable Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-08-23 12:32:23 UTC (rev 17887) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-08-23 13:04:19 UTC (rev 17888) @@ -51,6 +51,7 @@ private static final String JBOSS_HOME = System.getProperty("jboss.home"); private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows + private static final int TIMEOUT = Integer.getInteger("appclient.timeout", 120); private static final String EXT = ":".equals(PS) ? ".sh" : ".bat"; private static final String appclientScript = JBOSS_HOME + FS + "bin" + FS + "appclient" + EXT; private static final Semaphore s = new Semaphore(1, true); //one appclient only can be running at the same time ATM @@ -211,7 +212,7 @@ private static boolean awaitOutput(final OutputStream os, final String patternToMatch) throws InterruptedException { int countOfAttempts = 0; - final int maxCountOfAttempts = 240; // max wait time: 2 minutes + final int maxCountOfAttempts = TIMEOUT * 2; // max wait time: default 2 minutes while (!os.toString().contains(patternToMatch)) { Thread.sleep(500);

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17887 - stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-23 08:32:23 -0400 (Fri, 23 Aug 2013) New Revision: 17887 Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java Log: Adding some comments / improving javadoc Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-08-23 12:21:24 UTC (rev 17886) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/AppclientHelper.java 2013-08-23 12:32:23 UTC (rev 17887) @@ -71,6 +71,16 @@ // forbidden instantiation } + /** + * Triggers appclient deployment and returns the corresponding Process + * Please note the provided output stream (if any) is not automatically closed. + * + * @param archive + * @param appclientOS + * @param appclientArgs + * @return + * @throws Exception + */ static Process deployAppclient(final String archive, final OutputStream appclientOS, final String... appclientArgs) throws Exception { final AppclientProcess ap = newAppclientProcess(archive, appclientOS, appclientArgs); @@ -139,6 +149,10 @@ } } + //note on output streams closing: we're not caring about closing any here as it's quite a complex thing due to the TeeOutputStream nesting; + //we're however still safe, given the ap.output is a ByteArrayOutputStream (whose .close() does nothing), ap.log is explicitly closed at + //undeploy and closing appclientOS is a caller responsibility. + ap.log = new FileOutputStream(new File(getAppclientOutputDir(), appclientShortName + ".log-" + System.currentTimeMillis())); final OutputStream logOutputStreams = (appclientOS == null) ? ap.log : new TeeOutputStream(ap.log, appclientOS); printLogTrailer(logOutputStreams, appclientFullName);

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17886 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-23 08:21:24 -0400 (Fri, 23 Aug 2013) New Revision: 17886 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java Log: [JBWS-3695] Fixing concurrency issues in continuation testcase - thanks Petr Sakar for the patch Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java 2013-08-23 11:47:32 UTC (rev 17885) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/continuations/EndpointImpl.java 2013-08-23 12:21:24 UTC (rev 17886) @@ -38,37 +38,39 @@ @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.BARE) public class EndpointImpl { - private Executor executor = Executors.newCachedThreadPool(); + private final Executor executor = Executors.newCachedThreadPool(); private static final int TIMEOUT = 2000; @Resource - WebServiceContext ctx; + private WebServiceContext ctx; public String echo(String user) { final ContinuationProvider cp = (ContinuationProvider) ctx.getMessageContext().get(ContinuationProvider.class.getName()); final Continuation c = cp.getContinuation(); - if (c.isNew()) + synchronized (c) { - FutureTask<String> task = new FutureTask<String>(new MyCallable(user, c)); - c.setObject(task); - executor.execute(task); - c.suspend(TIMEOUT); - } - else - { - @SuppressWarnings("unchecked") - FutureTask<String> task = (FutureTask<String>) c.getObject(); - if (task.isDone()) + if (c.isNew()) { - try + FutureTask<String> task = new FutureTask<String>(new MyCallable(user, c)); + c.setObject(task); + executor.execute(task); + } + else + { + @SuppressWarnings("unchecked") + FutureTask<String> task = (FutureTask<String>) c.getObject(); + if (task.isDone()) { - return task.get(); + try + { + return task.get(); + } + catch (Exception e) + { + throw new RuntimeException(e); + } } - catch (Exception e) - { - throw new RuntimeException(e); - } } c.suspend(TIMEOUT); } @@ -78,8 +80,8 @@ private class MyCallable implements Callable<String> { - private String user; - private Continuation c; + private final String user; + private final Continuation c; public MyCallable(String user, Continuation c) {

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17885 - common/trunk/src/main/java/org/jboss/ws/common/concurrent.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-23 07:47:32 -0400 (Fri, 23 Aug 2013) New Revision: 17885 Modified: common/trunk/src/main/java/org/jboss/ws/common/concurrent/CopyJob.java Log: [JBWS-3694] CopyJob fix & improvement Modified: common/trunk/src/main/java/org/jboss/ws/common/concurrent/CopyJob.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/concurrent/CopyJob.java 2013-08-23 06:35:05 UTC (rev 17884) +++ common/trunk/src/main/java/org/jboss/ws/common/concurrent/CopyJob.java 2013-08-23 11:47:32 UTC (rev 17885) @@ -33,7 +33,7 @@ * new Thread( copyJob ).start(); * try * { - * // do some other staff + * // do some other stuff * ... * } * finally @@ -58,15 +58,29 @@ /** * Whether this job is terminated. */ - private boolean terminated; + private volatile boolean terminated; + + private final boolean closeOsOnExit; /** - * Constructor. + * Constructor; the input stream will automatically be closed on exit, while the output stream won't. + * * @param is input stream to read data from * @param os output stream to write data to */ public CopyJob( InputStream is, OutputStream os ) { + this(is, os, false); + } + + /** + * + * Constructor. + * @param is input stream to read data from + * @param os output stream to write data to + * @param closeOutputStreamOnExit whether to flush and close the output stream on exit + */ + public CopyJob( InputStream is, OutputStream os, boolean closeOutputStreamOnExit) { super(); if ( ( is == null ) || ( os == null ) ) @@ -76,6 +90,7 @@ this.is = is; this.os = os; + this.closeOsOnExit = closeOutputStreamOnExit; } /** @@ -93,7 +108,26 @@ } finally { - try { this.is.close(); } catch ( IOException ioe ) { ioe.printStackTrace( System.err ); } + try + { + this.is.close(); + } + catch (IOException ioe) + { + ioe.printStackTrace(System.err); + } + if (this.closeOsOnExit) + { + try + { + this.os.flush(); + this.os.close(); + } + catch (IOException ioe) + { + ioe.printStackTrace(System.err); + } + } } }

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17884 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2013-08-23 02:35:05 -0400 (Fri, 23 Aug 2013) New Revision: 17884 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java Log: [JBWS-3679]:Use local deployed endpoint address to initialize port and avoid to use the rewrote soap address Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2013-08-21 14:52:50 UTC (rev 17883) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/AbstractServiceObjectFactoryJAXWS.java 2013-08-23 06:35:05 UTC (rev 17884) @@ -33,6 +33,7 @@ import java.util.List; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.Service; import javax.xml.ws.WebServiceClient; @@ -77,8 +78,16 @@ { final QName portQName = this.getPortQName(targetClassName, serviceImplClass, serviceRef); final WebServiceFeature[] portFeatures = this.getFeatures(targetClassName, serviceImplClass, serviceRef); - - return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures); + String forcedAddress = null; + //if there is no wsdlLocation, always use the local deployed endpoint address to initialize port + URL wsdlURL = this.getWsdlURL(serviceRef, serviceClass); + final QName serviceQName = this.getServiceQName(serviceRef, serviceClass); + if (wsdlURL == null && serviceRef.getDeployedServiceAddresses().get(serviceQName) != null) + { + forcedAddress = serviceRef.getDeployedServiceAddresses().get(serviceQName); + } + return instantiatePort(serviceClass, targetClass, serviceInstance, portQName, portFeatures, + forcedAddress); } } finally @@ -168,7 +177,7 @@ } private Object instantiatePort(final Class<?> serviceClass, final Class<?> targetClass, final Service target, - final QName portQName, final WebServiceFeature[] features) throws NoSuchMethodException, + final QName portQName, final WebServiceFeature[] features, final String endpointAddress) throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException { Object retVal = null; @@ -198,7 +207,10 @@ port = method.invoke(target, args); retVal = port; } - + if (endpointAddress != null) + { + ((BindingProvider) retVal).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, endpointAddress); + } return retVal; }

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17883 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-21 10:52:50 -0400 (Wed, 21 Aug 2013) New Revision: 17883 Modified: stack/cxf/trunk/pom.xml Log: Use latest ASIL snapshots Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-08-21 14:35:35 UTC (rev 17882) +++ stack/cxf/trunk/pom.xml 2013-08-21 14:52:50 UTC (rev 17883) @@ -63,9 +63,9 @@ <jbossws.spi.version>2.2.1-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.2.1-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.2.0.Final</jbossws.common.tools.version> - <jbossws.jboss712.version>4.2.0.Final</jbossws.jboss712.version> - <jbossws.jboss713.version>4.2.0.Final</jbossws.jboss713.version> - <jbossws.jboss720.version>4.2.0.Final</jbossws.jboss720.version> + <jbossws.jboss712.version>4.2.1-SNAPSHOT</jbossws.jboss712.version> + <jbossws.jboss713.version>4.2.1-SNAPSHOT</jbossws.jboss713.version> + <jbossws.jboss720.version>4.2.1-SNAPSHOT</jbossws.jboss720.version> <jbossws.native.version>4.1.1.Final</jbossws.native.version> <jboss712.version>7.1.2.Final</jboss712.version> <jboss713.version>7.1.3.Final</jboss713.version>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17882 - stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-21 10:35:35 -0400 (Wed, 21 Aug 2013) New Revision: 17882 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java Log: [JBWS-3692] Tentative fix for transient failures Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-08-21 09:12:29 UTC (rev 17881) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2013-08-21 14:35:35 UTC (rev 17882) @@ -38,9 +38,12 @@ import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; +import junit.framework.Test; + import org.jboss.ws.common.ObjectNameFactory; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestSetup; import com.ibm.wsdl.extensions.soap.SOAPAddressImpl; @@ -64,26 +67,40 @@ private static final String NAMESPACE = "http://test.jboss.org/addressrewrite"; private static final String NAMESPACE_IMP = "http://test.jboss.org/addressrewrite/wsdlimp"; - private Boolean modifySOAPAddress; - private String webServiceHost; + protected static class JBWS2150TestSetup extends JBossWSTestSetup { + + protected static Boolean modifySOAPAddress; + protected static String webServiceHost; + + public JBWS2150TestSetup() { + super(JBWS2150TestCaseForked.class, null); + } - public void setUp() throws Exception - { - if (modifySOAPAddress == null) + public void setUp() throws Exception { modifySOAPAddress = (Boolean)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "ModifySOAPAddress"); webServiceHost = (String)getServer().getAttribute(SERVER_CONFIG_OBJECT_NAME, "WebServiceHost"); + super.setUp(); } } + public static Test suite() + { + return new JBWS2150TestSetup(); + } + public void tearDown() throws Exception { - Attribute attr = new Attribute("ModifySOAPAddress", modifySOAPAddress); + Attribute attr = new Attribute("ModifySOAPAddress", JBWS2150TestSetup.modifySOAPAddress); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); - attr = new Attribute("WebServiceHost", webServiceHost); + attr = new Attribute("WebServiceHost", JBWS2150TestSetup.webServiceHost); getServer().setAttribute(SERVER_CONFIG_OBJECT_NAME, attr); } + private String getWebServiceHost() { + return JBWS2150TestSetup.webServiceHost; + } + /** * Test soap:address rewrite with rewrite engine on * @@ -97,15 +114,15 @@ { final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -253,15 +270,15 @@ { final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); } for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) { @@ -354,15 +371,15 @@ { final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", webServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", webServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -400,9 +417,9 @@ deploy("jaxws-jbws2150-codefirst.war"); try { - checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), webServiceHost, false); + checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), getWebServiceHost(), false); if (isTestsuiteServerHostLocalhost()) { - checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", webServiceHost, false); + checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", getWebServiceHost(), false); } } finally @@ -422,9 +439,9 @@ deploy("jaxws-jbws2150-codefirst.war"); try { - checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), webServiceHost, false); + checkWsdlAndInvokeCodeFirstEndpoint(getServerHost(), getWebServiceHost(), false); if (isTestsuiteServerHostLocalhost()) { - checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", webServiceHost, false); + checkWsdlAndInvokeCodeFirstEndpoint("127.0.0.1", getWebServiceHost(), false); } } finally @@ -516,6 +533,12 @@ ServiceIface endpoint = getEndpoint(wsdlLocation, "CodeFirstService"); if (setTargetAddress) { ((BindingProvider)endpoint).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, addr); + } else { + //We can end up building multiple clients in the same bus and those clients might be built against + //different endpoints that are however published at the same address (at different time of course). + //So we explicitly set the BindingProvider.ENDPOINT_ADDRESS_PROPERTY in the req ctx to the soap:address + //from the wsdl to prevent caching related issues. + ((BindingProvider)endpoint).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, address); } assertEquals(endpoint.echo("hello"), "hello"); }

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r17881 - common/trunk/src/main/java/org/jboss/ws/common/management.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2013-08-21 05:12:29 -0400 (Wed, 21 Aug 2013) New Revision: 17881 Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java Log: [JBWS-3684] Making AbstractServerConfig more thread safe Modified: common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-08-20 15:18:34 UTC (rev 17880) +++ common/trunk/src/main/java/org/jboss/ws/common/management/AbstractServerConfig.java 2013-08-21 09:12:29 UTC (rev 17881) @@ -62,15 +62,17 @@ } // The MBeanServer - private MBeanServer mbeanServer; + private volatile MBeanServer mbeanServer; // The webservice host name that will be used when updating the wsdl - private String webServiceHost = UNDEFINED_HOSTNAME; + private volatile String webServiceHost = UNDEFINED_HOSTNAME; // The webservice port that will be used when updating the wsdl private int webServicePort; + private final Object webServicePortLock = new Object(); // The webservice port that will be used when updating the wsdl private int webServiceSecurePort; + private final Object webServiceSecurePortLock = new Object(); // Whether we should always modify the soap address to the deployed endpoint location - private boolean modifySOAPAddress; + private volatile boolean modifySOAPAddress; //The stack config protected StackConfig stackConfig; // The default endpoint configs, if any @@ -131,12 +133,18 @@ public void setWebServicePort(int port) { - this.webServicePort = port; + synchronized (webServicePortLock) + { + this.webServicePort = port; + } } public void setWebServiceSecurePort(int port) { - this.webServiceSecurePort = port; + synchronized (webServiceSecurePortLock) + { + this.webServiceSecurePort = port; + } } public boolean isModifySOAPAddress() @@ -151,32 +159,38 @@ public int getWebServicePort() { - if (webServicePort <= 0) - webServicePort = getConnectorPort(false); - - int localPort = webServicePort; - if (localPort <= 0) + synchronized (webServicePortLock) { - if (MANAGEMENT_LOGGER.isDebugEnabled()) MANAGEMENT_LOGGER.unableToCalculateWebServicesPort("8080"); - localPort = 8080; + if (webServicePort <= 0) + webServicePort = getConnectorPort(false); + + int localPort = webServicePort; + if (localPort <= 0) + { + if (MANAGEMENT_LOGGER.isDebugEnabled()) MANAGEMENT_LOGGER.unableToCalculateWebServicesPort("8080"); + localPort = 8080; + } + + return localPort; } - - return localPort; } public int getWebServiceSecurePort() { - if (webServiceSecurePort <= 0) - webServiceSecurePort = getConnectorPort(true); - - int localPort = webServiceSecurePort; - if (localPort <= 0) + synchronized (webServiceSecurePortLock) { - if (MANAGEMENT_LOGGER.isDebugEnabled()) MANAGEMENT_LOGGER.unableToCalculateWebServicesSecurePort("8443"); - localPort = 8443; + if (webServiceSecurePort <= 0) + webServiceSecurePort = getConnectorPort(true); + + int localPort = webServiceSecurePort; + if (localPort <= 0) + { + if (MANAGEMENT_LOGGER.isDebugEnabled()) MANAGEMENT_LOGGER.unableToCalculateWebServicesSecurePort("8443"); + localPort = 8443; + } + + return localPort; } - - return localPort; } private int getConnectorPort(boolean secure) { @@ -208,7 +222,10 @@ //cleanup the server integration classloader' service config reference as //a new server config can be created due to a server reload. - serverConfig = null; + synchronized (AbstractServerConfig.class) //synchronization to ensure visibility + { + serverConfig = null; + } } public void destroy() throws Exception @@ -219,14 +236,17 @@ } } - public static synchronized ServerConfig getServerIntegrationServerConfig() + public static ServerConfig getServerIntegrationServerConfig() { - if (serverConfig == null) - { - final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); - serverConfig = SPIProvider.getInstance().getSPI(ServerConfigFactory.class, cl).getServerConfig(); - } - return serverConfig; + synchronized (AbstractServerConfig.class) //ensure both atomicity and visibility + { + if (serverConfig == null) + { + final ClassLoader cl = ClassLoaderProvider.getDefaultProvider().getServerIntegrationClassLoader(); + serverConfig = SPIProvider.getInstance().getSPI(ServerConfigFactory.class, cl).getServerConfig(); + } + return serverConfig; + } } public String getImplementationTitle()

12 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2013