[jboss-svn-commits] JBossWS SVN: r1141 - in branches/tdiesler/jbossws-1.0: . src/main/java/org/jboss/ws src/test src/test/ant src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 4 18:09:19 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-10-04 18:09:05 -0400 (Wed, 04 Oct 2006)
New Revision: 1141
Removed:
branches/tdiesler/jbossws-1.0/src/main/java/org/jboss/ws/transport/
Modified:
branches/tdiesler/jbossws-1.0/ant.properties.example
branches/tdiesler/jbossws-1.0/build.xml
branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
branches/tdiesler/jbossws-1.0/src/test/build.xml
branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
Log:
[JBWS-1220] Testsuite no longer compiles with Java 1.4 JDK
Modified: branches/tdiesler/jbossws-1.0/ant.properties.example
===================================================================
--- branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/ant.properties.example 2006-10-04 22:09:05 UTC (rev 1141)
@@ -1,34 +1,34 @@
-#
-# A sample ant properties file
-#
-
-# Required JBoss Home
-#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
-
-# Optional JBoss Home
-#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
-
-# The JBoss server instance
-jboss.server.instance=default
-
-# Tomcat Home
-#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
-#tomcat.manager.username=manager
-#tomcat.manager.password=manager
-
-# The target server the test endpoints are deployed to
-# This can be [jboss|tomcat]
-jbossws.target.server=jboss
-
-# JBoss Repository
-jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
-jboss.repository=http://repository.jboss.com
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=yes
-javac.fail.onerror=yes
-javac.verbose=no
+#
+# A sample ant properties file
+#
+
+# Required JBoss Home
+#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3
+
+# Optional JBoss Home
+#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA
+
+# The JBoss server instance
+jboss.server.instance=default
+
+# Tomcat Home
+#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17
+#tomcat.manager.username=manager
+#tomcat.manager.password=manager
+
+# The target server the test endpoints are deployed to
+# This can be [jboss|tomcat]
+jbossws.target.server=jboss
+
+# JBoss Repository
+jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository
+jboss.repository=http://repository.jboss.com
+
+# Force thirdparty HTTP get
+#force.thirdparty.get=true
+
+# Java Compiler options
+javac.debug=yes
+javac.deprecation=yes
+javac.fail.onerror=yes
+javac.verbose=no
Modified: branches/tdiesler/jbossws-1.0/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/build.xml 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/build.xml 2006-10-04 22:09:05 UTC (rev 1141)
@@ -151,7 +151,6 @@
<javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}"
failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
@@ -226,7 +225,6 @@
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
<fileset dir="${build.resources.dir}">
@@ -240,7 +238,6 @@
<fileset dir="${build.classes.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
@@ -266,7 +263,6 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -353,7 +349,6 @@
<fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
<fileset dir="${build.resources.dir}">
@@ -362,16 +357,22 @@
</fileset>
</jar>
- <!-- Build jbossws-jboss-integration.jar -->
+ <!-- Build jbossws14-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
- <include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/>
</fileset>
</jar>
+ <!-- Build jbossws14-tomcat-integration.jar -->
+ <jar jarfile="${build.lib.dir}/jbossws14-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="org/jboss/ws/integration/tomcat/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws14-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes14.dir}">
@@ -379,7 +380,6 @@
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
<exclude name="org/jboss/ws/integration/tomcat/**"/>
- <exclude name="org/jboss/ws/transport/jms/**"/>
</fileset>
<fileset dir="${build.resources.dir}/jbossws.sar">
<include name="META-INF/standard-jaxrpc-client-config.xml"/>
@@ -422,7 +422,6 @@
<!--
Retrotranslation
-->
-
<target name="jbossretro" depends="compile">
<!-- Weave the build.classes to build.classes14 -->
Modified: branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-04 22:09:05 UTC (rev 1141)
@@ -16,7 +16,7 @@
<!-- Building -->
<!-- ================================================================== -->
- <target name="build-jars" description="Build the deployments.">
+ <target name="build-jars" description="Build the jaxrpc deployments">
<!-- jaxrpc-anonymous -->
<war warfile="${build.test.dir}/libs/jaxrpc-anonymous.war" webxml="${build.test.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml">
Modified: branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/src/test/ant/build-jars-jaxws.xml 2006-10-04 22:09:05 UTC (rev 1141)
@@ -16,7 +16,7 @@
<!-- Building -->
<!-- ================================================================== -->
- <target name="build-jars" description="Build the deployments.">
+ <target name="build-jars" description="Build the jaxws deployments" if="HAVE_JDK_1.5">
<!-- jaxws-jbws860 -->
<war warfile="${build.test.dir}/libs/jaxws-jbws860.war" webxml="${build.test.dir}/resources/jaxws/jbws860/WEB-INF/web.xml">
Modified: branches/tdiesler/jbossws-1.0/src/test/build.xml
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/src/test/build.xml 2006-10-04 22:09:05 UTC (rev 1141)
@@ -102,15 +102,17 @@
-->
<target name="init" depends="prepare,thirdparty">
- <condition property="jbossws.client.jar" value="jbossws14-client.jar">
+ <condition property="jbossws.build" value="jbossws14">
<not>
<isset property="HAVE_JDK_1.5"/>
</not>
</condition>
- <condition property="jbossws.client.jar" value="jbossws-client.jar">
+ <condition property="jbossws.build" value="jbossws">
<isset property="HAVE_JDK_1.5"/>
</condition>
+ <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/>
+
<!-- Check that the latest build has been deployed -->
<condition property="jbossws.deployed">
<filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/>
@@ -148,8 +150,8 @@
<pathelement location="${jboss.server.lib}/jboss.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
</path>
<!--
@@ -158,8 +160,8 @@
-->
<path id="test.client.classpath">
<path refid="jbossws.client.classpath"/>
- <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/>
- <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/>
+ <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/>
<pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/>
<pathelement location="${jboss.lib}/jboss-system.jar"/>
<pathelement location="${jboss.server.lib}/jboss.jar"/>
@@ -182,18 +184,8 @@
<mkdir dir="${build.test.dir}/classes"/>
<javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${test.java.dir}"/>
- <!-- TODO - Remove dynamichandler once Java 5.0 code is removed -->
- <exclude name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/>
<exclude name="org/jboss/test/ws/interop/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jsr181/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws1123/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws860/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws871/**"/>
- <exclude name="org/jboss/test/ws/jaxws/jbws944/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/>
- <exclude name="org/jboss/test/ws/jaxws/wsaddressing/**"/>
- <exclude name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/>
+ <exclude name="org/jboss/test/ws/jaxws/**"/>
<exclude name="org/jboss/test/ws/tools/jsr181/**"/>
<classpath refid="javac.classpath"/>
</javac>
Modified: branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-10-04 22:09:05 UTC (rev 1141)
@@ -101,11 +101,11 @@
ObjectName oname = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager");
ObjectName serviceID = new ObjectName("jboss.ws:context=jaxrpc-samples-dynamichandler,endpoint=TestService");
- List<HandlerMetaData> handlers = (List<HandlerMetaData>)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
- Iterator<HandlerMetaData> it = handlers.iterator();
+ List handlers = (List)server.invoke(oname, "getHandlerMetaData", new Object[]{serviceID}, new String[]{"javax.management.ObjectName"});
+ Iterator it = handlers.iterator();
while (it.hasNext())
{
- HandlerMetaData handlerMetaData = it.next();
+ HandlerMetaData handlerMetaData = (HandlerMetaData)it.next();
if (handlerMetaData.getHandlerClass().equals(ServerSideHandler.class.getName()))
it.remove();
}
Modified: branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-10-04 21:27:12 UTC (rev 1140)
+++ branches/tdiesler/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2006-10-04 22:09:05 UTC (rev 1141)
@@ -8,8 +8,6 @@
// $Id$
-import java.util.concurrent.CountDownLatch;
-
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.Queue;
@@ -36,11 +34,8 @@
*/
public class JMSTransportTestCase extends JBossWSTest
{
- private static CountDownLatch count;
-
public static Test suite() throws Exception
{
- count = new CountDownLatch(1);
return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar");
}
@@ -87,8 +82,6 @@
sender.send(message);
sender.close();
- // Please explain to me why this does not work relieably
- // count.await();
Thread.sleep(500);
assertNotNull("Expected response message", responseListener.resMessage);
@@ -108,7 +101,6 @@
TextMessage textMessage = (TextMessage)msg;
try
{
- count.countDown();
resMessage = textMessage.getText();
}
catch (Throwable t)
More information about the jboss-svn-commits
mailing list