JBossWS SVN: r15880 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-06 08:32:44 -0500 (Tue, 06 Mar 2012)
New Revision: 15880
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
Log:
[JBWS-3444] fix typo
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-06 13:29:47 UTC (rev 15879)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2012-03-06 13:32:44 UTC (rev 15880)
@@ -52,7 +52,7 @@
{
return new JBossWSTestSetup(AddressingReplyToTestCase.class,
"jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," +
- "jaxrpc-samples-wsaddr-hello-appclient.jar#jaxrpc-samples-wsaddr-hello-appclient.jar");
+ "jaxrpc-samples-wsaddr-hello-appclient.ear#jaxrpc-samples-wsaddr-hello-appclient.jar");
}
protected void setUp() throws Exception
14 years, 1 month
JBossWS SVN: r15879 - stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-06 08:29:47 -0500 (Tue, 06 Mar 2012)
New Revision: 15879
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
Log:
[JBWS-3390] Synch with AS 7.1.x
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-03-06 12:04:53 UTC (rev 15878)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/jboss710/org/apache/cxf/main/module.xml 2012-03-06 13:29:47 UTC (rev 15879)
@@ -46,6 +46,7 @@
<module name="org.apache.commons.lang" />
<module name="org.apache.neethi" />
<module name="org.apache.velocity" />
+ <module name="org.apache.xml-resolver" />
<module name="org.apache.ws.xmlschema" />
<module name="org.apache.ws.security" />
<module name="org.apache.santuario.xmlsec" />
14 years, 1 month
JBossWS SVN: r15878 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-06 07:04:53 -0500 (Tue, 06 Mar 2012)
New Revision: 15878
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
Set proper (different) default jbossws-native-core version in bin-dist client classpath + reorder as per previous Richard's patch in maven based testsuite
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-06 10:09:35 UTC (rev 15877)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-06 12:04:53 UTC (rev 15878)
@@ -119,6 +119,14 @@
<isset property="jboss.home"/>
</condition>
+ <!-- JBossWS Native Core version -->
+ <condition property="jbossws-native-core.default-filename" value="4.0.1.GA">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss710"/>
+ </condition>
+ <condition property="jbossws-native-core.default-filename" value="4.0.2.GA">
+ <equals arg1="${jbossws.integration.target}" arg2="jboss711"/>
+ </condition>
+
<echo/>
<echo message="-----------------------------------------------"/>
<echo message="jboss.home = ${jboss.home}"/>
@@ -398,13 +406,13 @@
<include name="jbossxb-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-4.0.1.GA.jar"/>
+ <include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
<include name="jbossws-native-core.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-${jbossws-native-core.filename}.jar"/>
+ <include name="jbossws-native-core-${jbossws-native-core.default-filename}.jar"/>
</fileset>
<!-- END ## jaxrpc tests ## -->
<fileset dir="${jboss.home}/modules/org/apache/xalan/main/">
14 years, 1 month
JBossWS SVN: r15877 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-06 05:09:35 -0500 (Tue, 06 Mar 2012)
New Revision: 15877
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
JBoss MD 7.0.1.Final have been released
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2012-03-05 16:04:12 UTC (rev 15876)
+++ stack/native/trunk/modules/testsuite/pom.xml 2012-03-06 10:09:35 UTC (rev 15877)
@@ -1163,21 +1163,6 @@
<exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude>
-
- <!-- # [AS7-3946] waiting for jboss metadata 7.0.1.Final upgrade -->
- <exclude>org/jboss/test/ws/jaxws/webserviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/jbws1121/JBWS1121TestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/RpcTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/SignEncryptFaultTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/SignFaultTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/SimpleSignEncryptTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/UsernameTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*</exclude>
</excludes>
</configuration>
</plugin>
14 years, 1 month
JBossWS SVN: r15876 - shared-testsuite/tags/jbossws-shared-testsuite-4.0.2.GA/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 11:04:12 -0500 (Mon, 05 Mar 2012)
New Revision: 15876
Modified:
shared-testsuite/tags/jbossws-shared-testsuite-4.0.2.GA/testsuite/src/test/ant-import/build-testsuite.xml
Log:
JBoss AS 710 ships with version 401 of jbossws-native-core (tag not built yet)
Modified: shared-testsuite/tags/jbossws-shared-testsuite-4.0.2.GA/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/tags/jbossws-shared-testsuite-4.0.2.GA/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-05 16:02:24 UTC (rev 15875)
+++ shared-testsuite/tags/jbossws-shared-testsuite-4.0.2.GA/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-05 16:04:12 UTC (rev 15876)
@@ -398,7 +398,7 @@
<include name="jbossxb-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-4.0.0.GA.jar"/>
+ <include name="jbossws-native-core-4.0.1.GA.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
<include name="jbossws-native-core.jar"/>
14 years, 1 month
JBossWS SVN: r15875 - shared-testsuite/trunk/testsuite/src/test/ant-import.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 11:02:24 -0500 (Mon, 05 Mar 2012)
New Revision: 15875
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
Log:
JBoss AS 710 ships with version 401 of jbossws-native-core
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-05 14:05:40 UTC (rev 15874)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-03-05 16:02:24 UTC (rev 15875)
@@ -398,7 +398,7 @@
<include name="jbossxb-*.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
- <include name="jbossws-native-core-4.0.0.GA.jar"/>
+ <include name="jbossws-native-core-4.0.1.GA.jar"/>
</fileset>
<fileset dir="${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/">
<include name="jbossws-native-core.jar"/>
14 years, 1 month
JBossWS SVN: r15874 - in stack/native/branches/jbossws-native-4.0.x: modules/dist/src/main/distro and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 09:05:40 -0500 (Mon, 05 Mar 2012)
New Revision: 15874
Modified:
stack/native/branches/jbossws-native-4.0.x/
stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt
Log:
Merged revisions 15871 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/native/trunk
.......
r15871 | alessio.soldano(a)jboss.com | 2012-03-05 13:28:07 +0100 (Mon, 05 Mar 2012) | 2 lines
Updating release notes
.......
Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
+ https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567...
Modified: svn:mergeinfo
- /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15861
+ /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15861,15871
Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-05 13:56:08 UTC (rev 15873)
+++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-05 14:05:40 UTC (rev 15874)
@@ -49,6 +49,30 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------------
+jbossws-native-4.0.2.GA
+-----------------------
+
+Feature Request
+
+ * [JBWS-3439] - Upgrade to Apache WSS4J 1.6.5 and Santuario 1.5.1
+
+Bug
+
+ * [JBWS-3432] - WebservicesFactory can't parse webservices.xml with javaee:descriptionGroup references
+
+Task
+
+ * [JBWS-3442] - Verify dependencies are up to date
+ * [JBWS-3437] - WS Refs have to keep classloader reference
+ * [JBWS-3438] - JAX-RPC generated proxies have to be de/serializable
+ * [JBWS-3444] - Review and rewrite appclient tests
+
+Errata
+
+ See: https://issues.jboss.org/browse/JBWS-3450
+
+
+-----------------------
jbossws-native-4.0.1.GA
-----------------------
14 years, 1 month
JBossWS SVN: r15873 - stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-05 08:56:08 -0500 (Mon, 05 Mar 2012)
New Revision: 15873
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java
Log:
[JBWS-3435] don't call Exit in killer
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-05 13:49:38 UTC (rev 15872)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-05 13:56:08 UTC (rev 15873)
@@ -46,7 +46,6 @@
break;
}
}
- System.exit(1);
}
}
14 years, 1 month
JBossWS SVN: r15872 - in shared-testsuite/trunk: testsuite/src/test/java/org/jboss/test/ws/appclient and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2012-03-05 08:49:38 -0500 (Mon, 05 Mar 2012)
New Revision: 15872
Modified:
shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java
Log:
[JBWS-3435] fix CopyJob thread leak
Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java
===================================================================
--- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-05 12:28:07 UTC (rev 15871)
+++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-03-05 13:49:38 UTC (rev 15872)
@@ -81,6 +81,8 @@
private static String testResourcesDir;
private static Process appclientProcess;
private static OutputStream appclientOutput;
+ private static CopyJob appclientOutTask;
+ private static CopyJob appclientErrTask;
private static synchronized Deployer getDeployer()
{
@@ -145,24 +147,26 @@
}
appclientProcess = new ProcessBuilder().command(args).start();
}
- final CopyJob inputStreamJob = new CopyJob(appclientProcess.getInputStream(),
+ // appclient out
+ if (appclientOutTask != null) {
+ appclientOutTask.kill();
+ }
+ appclientOutTask = new CopyJob(appclientProcess.getInputStream(),
appclientOS == null ? new TeeOutputStream(appclientOutput, System.out) : new TeeOutputStream(appclientOutput, System.out, appclientOS));
- final CopyJob errorStreamJob = new CopyJob(appclientProcess.getErrorStream(), System.err);
+ // appclient err
+ if (appclientErrTask != null) {
+ appclientErrTask.kill();
+ }
+ appclientErrTask = new CopyJob(appclientProcess.getErrorStream(), System.err);
// unfortunately the following threads are needed because of Windows behavior
- System.out.println("Appclient output stream:");
- new Thread(inputStreamJob).start();
- new Thread(errorStreamJob).start();
- int countOfAttempts = 0;
- final int maxCountOfAttempts = 30; // max wait time: 30 seconds
- while (!appclientOutput.toString().contains("Deployed \"" + earName + "\""))
- {
- Thread.sleep(1000);
- if (countOfAttempts++ == maxCountOfAttempts)
- {
- throw new RuntimeException("Cannot deploy " + appclientFullName + " to appclient");
- }
- }
+ new Thread(appclientOutTask).start();
+ new Thread(appclientErrTask).start();
+ final String patternToMatch = "Deployed \"" + earName + "\"";
+ final String errorMessage = "Cannot deploy " + appclientFullName + " to appclient";
+ awaitOutput(patternToMatch, errorMessage);
+ System.out.println("-----------------");
System.out.println("appclient started");
+ System.out.println("-----------------");
}
return appclientProcess;
}
@@ -175,27 +179,39 @@
if (DEPLOY_PROCESS_ENABLED)
{
final int sharpIndex = archive.indexOf('#');
+ final String earName = archive.substring(0, sharpIndex);
+ final String appclientFullName = getArchiveFile(earName).getParent() + FS + archive;
final File touchFile = new File(JBOSS_HOME + FS + "bin" + FS + archive.substring(sharpIndex + 1) + ".kill");
touchFile.createNewFile();
- appclientProcess.waitFor();
- /*
- int countOfAttempts = 0;
- final int maxCountOfAttempts = 30; // max wait time: 30 seconds
- while (!appclientOutput.toString().contains("stopped in"))
+ final String patternToMatch = "stopped in";
+ final String errorMessage = "Cannot undeploy " + appclientFullName + " from appclient";
+ try
{
- Thread.sleep(1000);
- if (countOfAttempts++ == maxCountOfAttempts)
- {
- throw new RuntimeException("Cannot stop appclient");
- }
+ awaitOutput(patternToMatch, errorMessage);
}
- */
- appclientProcess = null;
- touchFile.delete();
+ finally
+ {
+ touchFile.delete();
+ }
+ System.out.println("-----------------");
System.out.println("appclient stopped");
+ System.out.println("-----------------");
}
}
+ private static void awaitOutput(final String patternToMatch, final String errorMessage) throws InterruptedException {
+ int countOfAttempts = 0;
+ final int maxCountOfAttempts = 120; // max wait time: 2 minutes
+ while (!appclientOutput.toString().contains(patternToMatch))
+ {
+ Thread.sleep(1000);
+ if (countOfAttempts++ == maxCountOfAttempts)
+ {
+ throw new RuntimeException(errorMessage);
+ }
+ }
+ }
+
public static boolean isTargetJBoss7()
{
String target = getIntegrationTarget();
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-05 12:28:07 UTC (rev 15871)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/appclient/AppclientKiller.java 2012-03-05 13:49:38 UTC (rev 15872)
@@ -46,7 +46,6 @@
break;
}
}
- System.exit(1);
}
}
14 years, 1 month
JBossWS SVN: r15871 - stack/native/trunk/modules/dist/src/main/distro.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-03-05 07:28:07 -0500 (Mon, 05 Mar 2012)
New Revision: 15871
Modified:
stack/native/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
Log:
Updating release notes
Modified: stack/native/trunk/modules/dist/src/main/distro/ReleaseNotes.txt
===================================================================
--- stack/native/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-05 12:26:33 UTC (rev 15870)
+++ stack/native/trunk/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-05 12:28:07 UTC (rev 15871)
@@ -49,6 +49,30 @@
Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------------
+jbossws-native-4.0.2.GA
+-----------------------
+
+Feature Request
+
+ * [JBWS-3439] - Upgrade to Apache WSS4J 1.6.5 and Santuario 1.5.1
+
+Bug
+
+ * [JBWS-3432] - WebservicesFactory can't parse webservices.xml with javaee:descriptionGroup references
+
+Task
+
+ * [JBWS-3442] - Verify dependencies are up to date
+ * [JBWS-3437] - WS Refs have to keep classloader reference
+ * [JBWS-3438] - JAX-RPC generated proxies have to be de/serializable
+ * [JBWS-3444] - Review and rewrite appclient tests
+
+Errata
+
+ See: https://issues.jboss.org/browse/JBWS-3450
+
+
+-----------------------
jbossws-native-4.0.1.GA
-----------------------
14 years, 1 month