[jboss-remoting-commits] JBoss Remoting SVN: r4548 - remoting2/branches/2.x.
Author: ron.sigal(a)jboss.com
Date: 2008-09-08 02:11:29 -0400 (Mon, 08 Sep 2008)
New Revision: 4548
Modified:
remoting2/branches/2.x/build.xml
Log:
JBREM-1033: Excluded http classes when using jdk 1.4.
Modified: remoting2/branches/2.x/build.xml
===================================================================
--- remoting2/branches/2.x/build.xml 2008-09-07 21:17:10 UTC (rev 4547)
+++ remoting2/branches/2.x/build.xml 2008-09-08 06:11:29 UTC (rev 4548)
@@ -272,8 +272,18 @@
<path id="third_party.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
- <exclude name="apache-tomcat/*.jar"
unless="isJDK4"/>
+ <!--exclude name="apache-tomcat/*.jar"
unless="isJDK4"/-->
+ <include name="**/jdk14/*.jar" if="isJDK4"/>
+ <exclude name="apache-log4j/lib/log4j.jar"
if="isJDK4"/>
+ <exclude name="jboss/jboss-j2se.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-common-core.jar"
if="isJDK4"/>
+ <exclude name="jboss/jboss-jmx.jar" if="isJDK4"/>
+ <exclude name="jboss/jboss-logging-log4j.jar"
if="isJDK4"/>
+ <exclude name="jboss/jboss-logging-spi.jar"
if="isJDK4"/>
+ <exclude name="jboss/jnpserver.jar" if="isJDK4"/>
<exclude name="jbossweb/*.jar" if="isJDK4"/>
+ <exclude name="oswego-concurrent/lib/concurrent.jar"
if="isJDK4"/>
+ <exclude name="sun-servlet/lib/servlet-api.ja"
if="isJDK4"/>
</fileset>
</path>
@@ -402,8 +412,13 @@
deprecation="on"
optimize="off"
includes="**/*.java"
- failonerror="true">
+ failonerror="true"
+ sourcepath="">
<src path="${src.dir}"/>
+ <include name="**/*.java"/>
+ <exclude name="org/jboss/remoting/transport/coyote/**"
if="isJDK4"/>
+ <exclude
name="org/jboss/remoting/transport/http/TransportServerFactory.java"
if="isJDK4"/>
+ <exclude
name="org/jboss/remoting/transport/https/TransportServerFactory.java"
if="isJDK4"/>
<classpath refid="library.classpath"/>
</javac>
@@ -488,8 +503,13 @@
deprecation="on"
optimize="off"
includes="**/*.java"
- failonerror="true">
+ failonerror="true"
+ sourcepath="">
<src path="${tests.src.dir}"/>
+ <include name="**/*.java"/>
+ <exclude name="org/jboss/test/remoting/**/http/**"
if="isJDK4"/>
+ <exclude name="org/jboss/test/remoting/**/https/**"
if="isJDK4"/>
+ <exclude name="org/jboss/test/remoting/**/servlet/**"
if="isJDK4"/>
<classpath refid="tests.classpath"/>
</javac>
@@ -975,18 +995,18 @@
<antcall target="tests.functional.http.jbossweb.core"
inheritrefs="true">
<param name="serialization" value="java"/>
</antcall>
- <antcall target="tests.functional.http.tomcat.core"
inheritrefs="true">
+ <!--antcall target="tests.functional.http.tomcat.core"
inheritrefs="true">
<param name="serialization" value="java"/>
- </antcall>
+ </antcall-->
</target>
<target name="tests.functional.serialization.jboss.http.core"
unless="isJDK4">
<antcall target="tests.functional.http.jbossweb.core"
inheritrefs="true">
<param name="serialization" value="jboss"/>
</antcall>
- <antcall target="tests.functional.http.tomcat.core"
inheritrefs="true">
+ <!--antcall target="tests.functional.http.tomcat.core"
inheritrefs="true">
<param name="serialization" value="jboss"/>
- </antcall>
+ </antcall-->
</target>
<target name="tests.functional.http.jbossweb.core"
unless="isJDK4">