Author: ron.sigal(a)jboss.com Date: 2011-04-14 12:02:00 -0400 (Thu, 14 Apr 2011) New Revision: 6320 Modified: remoting2/branches/2.2/build.xml Log: JBREM-1280, JBREM-1281: Eliminated http transports when using jdk 1.4. Modified: remoting2/branches/2.2/build.xml =================================================================== --- remoting2/branches/2.2/build.xml 2011-04-13 23:39:31 UTC (rev 6319) +++ remoting2/branches/2.2/build.xml 2011-04-14 16:02:00 UTC (rev 6320) @@ -189,7 +189,7 @@ <!-- Compile --> <!-- ================================================================== --> <target name="compile" description="Compile all source files." depends="configure"> - + <echo>${java.runtime.version}</echo> <mkdir dir="${compile.dir}"/> <!-- java source compile --> @@ -200,8 +200,19 @@ deprecation="on" optimize="off" includes="**/*.java" - failonerror="true"> + failonerror="true" + sourcepath=""> <src path="${src.dir}"/> + <exclude name="org/jboss/remoting/transport/coyote/**" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/HTTPServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/http/ssl/HTTPSServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/https/HTTPSServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/https/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/servlet/ServletServerInvoker.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/servlet/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/sslservlet/TransportServerFactory.java" if="isJDK4"/> + <exclude name="org/jboss/remoting/transport/web/WebServerInvoker.java" if="isJDK4"/> <classpath refid="library.classpath"/> </javac> @@ -288,6 +299,13 @@ includes="**/*.java" failonerror="true"> <src path="${tests.src.dir}"/> + <include name="**/*.java"/> + <exclude name="org/jboss/test/remoting/**/coyote/**" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/http/**" if="isJDK4"/> + <exclude name="org/jboss/test/remoting/**/*HTTP*" if="isJDK4"/> + <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> @@ -851,6 +869,12 @@ haltonfailure="no"> <fileset dir="${tests.compile.dir}"> <include name="**/remoting/**/*TestCase.class"/> + <exclude name="**/remoting/**/coyote/**/*TestCase.class"/> + <exclude name="**/remoting/**/coyote/**/*oyot*TestCase.class"/> + <exclude name="**/remoting/**/http/**/*TestCase.class"/> + <exclude name="**/remoting/**/*HTTP*TestCase.class"/> + <exclude name="**/remoting/**/*Http*TestCase.class"/> + <exclude name="**/remoting/**/*http*TestCase.class"/> <exclude name="**/remoting/**/ServerBindingTestCase.class"/> <exclude name="**/remoting/marshall/dynamic/remote/**/*TestCase.class"/> <exclude name="**/remoting/serialization/**/jboss/*TestCase.class"/> @@ -872,7 +896,7 @@ </batchtest> </junit> </target> - + <target name="tests.functional.serialization.java.http.core" unless="isJDK4"> <antcall target="tests.functional.http.jbossweb.core" inheritrefs="true"> <param name="serialization" value="java"/> @@ -894,7 +918,7 @@ <param name="version" value="jbossweb"/> </antcall> </target> - + <target name="tests.functional.main.http.core"> <mkdir dir="${output.tests.results}"/> <echo>http with ${version}: ${metadata}</echo> @@ -922,12 +946,14 @@ <batchtest fork="yes" todir="${output.tests.results}" haltonfailure="no"> <fileset dir="${tests.compile.dir}"> + <include name="**/remoting/**/coyote/**/*TestCase.class"/> + <include name="**/remoting/**/coyote/**/*oyot*TestCase.class"/> <include name="**/remoting/**/http/**/*TestCase.class"/> <include name="**/remoting/**/*HTTP*TestCase.class"/> <include name="**/remoting/**/*Http*TestCase.class"/> <include name="**/remoting/**/*http*TestCase.class"/> <exclude name="**/remoting/**/HTTPSAsynchCallbackTestCase.class"/> - <exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/> + <exclude name="**/remoting/**/HTTPInvokerClientTestCase.class"/> <exclude name="**/remoting/transport/http/compression/*CompressedHTTPInvokerTestCase*"/> <exclude name="**/remoting/**/performance/**"/> <exclude name="**/remoting/**/nonserializable/**"/> @@ -1110,7 +1136,7 @@ <condition property="isJDK5"> <or> <equals arg1="${ant.java.version}" arg2="1.5"/> - <equals arg1="${ant.java.version}" arg2="1.6"/> + <equals arg1="${ant.java.version}" arg2="1.6"/> </or> </condition> <condition property="isJDK4"> @@ -1773,7 +1799,7 @@ <param name="clientImplementsServerIdentity" value="true"/> <param name="serverImplementsServerIdentity" value="false"/> </antcall> - + <!-- ******************************************************************************** --> <!-- Current <- -> 2.2.3.SP2 --> <antcall target="tests.versioning.all_transports" inheritrefs="true">