Author: david.lloyd(a)jboss.com Date: 2008-10-20 22:40:49 -0400 (Mon, 20 Oct 2008) New Revision: 4602 Modified: remoting3/trunk/build.xml Log: The basic protocol is really a multiplex protocol. Make room for a *real* basic protocol. (2) Modified: remoting3/trunk/build.xml =================================================================== --- remoting3/trunk/build.xml 2008-10-21 02:39:24 UTC (rev 4601) +++ remoting3/trunk/build.xml 2008-10-21 02:40:49 UTC (rev 4602) @@ -737,12 +737,12 @@ </path> </target> - <!-- protocol.basic module --> + <!-- protocol.multiplex module --> - <target name="protocol.basic.compile.depcheck"> - <mkdir dir="protocol/basic/target/main"/> - <uptodate property="protocol/basic.compile.uptodate" targetfile="protocol/basic/target/main/.lastcompile"> - <srcfiles dir="protocol/basic/src/main/java"> + <target name="protocol.multiplex.compile.depcheck"> + <mkdir dir="protocol/multiplex/target/main"/> + <uptodate property="protocol/multiplex.compile.uptodate" targetfile="protocol/multiplex/target/main/.lastcompile"> + <srcfiles dir="protocol/multiplex/src/main/java"> <include name="**/"/> <include name="**/*.java"/> <exclude name="**/.*"/> @@ -750,13 +750,13 @@ </uptodate> </target> - <target name="protocol.basic.compile" depends="protocol.basic.compile.depcheck" unless="protocol.basic.compile.uptodate"> - <mkdir dir="protocol/basic/target/main/classes"/> + <target name="protocol.multiplex.compile" depends="protocol.multiplex.compile.depcheck" unless="protocol.multiplex.compile.uptodate"> + <mkdir dir="protocol/multiplex/target/main/classes"/> <javac source="${javac.source}" target="${javac.target}" - srcdir="protocol/basic/src/main/java" - destdir="protocol/basic/target/main/classes" + srcdir="protocol/multiplex/src/main/java" + destdir="protocol/multiplex/target/main/classes" debug="true"> <compilerarg value="-Xlint:unchecked"/> <classpath> @@ -768,13 +768,13 @@ <pathelement location="${lib.xnio-api.local}"/> </classpath> </javac> - <touch file="protocol/basic/target/main/.lastcompile" verbose="false"/> + <touch file="protocol/multiplex/target/main/.lastcompile" verbose="false"/> </target> - <target name="protocol.basic.test.compile.depcheck"> - <mkdir dir="protocol/basic/target/test"/> - <uptodate property="protocol.basic.compile.uptodate" targetfile="protocol/basic/target/test/.lastcompile"> - <srcfiles dir="protocol/basic/src/test/java"> + <target name="protocol.multiplex.test.compile.depcheck"> + <mkdir dir="protocol/multiplex/target/test"/> + <uptodate property="protocol.multiplex.compile.uptodate" targetfile="protocol/multiplex/target/test/.lastcompile"> + <srcfiles dir="protocol/multiplex/src/test/java"> <include name="**/"/> <include name="**/*.java"/> <exclude name="**/.*"/> @@ -782,19 +782,19 @@ </uptodate> </target> - <target name="protocol.basic.test.compile" depends="lib.junit,protocol.basic.compile,protocol.basic.test.compile.depcheck" unless="protocol.basic.test.compile.uptodate"> - <mkdir dir="protocol/basic/target/test/classes"/> + <target name="protocol.multiplex.test.compile" depends="lib.junit,protocol.multiplex.compile,protocol.multiplex.test.compile.depcheck" unless="protocol.multiplex.test.compile.uptodate"> + <mkdir dir="protocol/multiplex/target/test/classes"/> <javac source="${javac.source}" target="${javac.target}" - srcdir="protocol/basic/src/test/java" - destdir="protocol/basic/target/test/classes" + srcdir="protocol/multiplex/src/test/java" + destdir="protocol/multiplex/target/test/classes" debug="true"> <compilerarg value="-Xlint:unchecked"/> <classpath> <path refid="api.classpath"/> <path refid="core.classpath"/> - <path refid="protocol.basic.classpath"/> + <path refid="protocol.multiplex.classpath"/> <path refid="util.classpath"/> <path refid="testing-support.classpath"/> <pathelement location="${lib.junit.local}"/> @@ -804,14 +804,14 @@ <pathelement location="${lib.xnio-nio.local}"/> </classpath> </javac> - <touch file="protocol/basic/target/test/.lastcompile" verbose="false"/> + <touch file="protocol/multiplex/target/test/.lastcompile" verbose="false"/> </target> - <target name="protocol.basic.test.pseudotarget"> + <target name="protocol.multiplex.test.pseudotarget"> <echo message="============================================="/> <echo message="${message}"/> <echo message="============================================="/> - <mkdir dir="protocol/basic/target/test-results"/> + <mkdir dir="protocol/multiplex/target/test-results"/> <junit printsummary="true" fork="yes" includeantruntime="true"> <sysproperty key="build.home" value="${basedir}"/> <sysproperty key="ant.library.dir" value="${ant.home}/lib"/> @@ -824,45 +824,45 @@ <classpath> <path refid="api.classpath"/> <path refid="core.classpath"/> - <path refid="protocol.basic.classpath"/> + <path refid="protocol.multiplex.classpath"/> <path refid="testing-support.classpath"/> <path refid="util.classpath"/> - <pathelement location="protocol/basic/target/test/classes"/> + <pathelement location="protocol/multiplex/target/test/classes"/> <pathelement location="${lib.junit.local}"/> <pathelement location="${lib.marshalling-api.local}"/> <pathelement location="${lib.river.local}"/> <pathelement location="${lib.xnio-api.local}"/> <pathelement location="${lib.xnio-nio.local}"/> </classpath> - <batchtest fork="yes" todir="protocol/basic/target/test-results" + <batchtest fork="yes" todir="protocol/multiplex/target/test-results" haltonfailure="no"> - <fileset dir="protocol/basic/target/test/classes"> + <fileset dir="protocol/multiplex/target/test/classes"> <include name="**/*TestCase.class"/> </fileset> </batchtest> </junit> </target> - <target name="protocol.basic.test" depends="lib.xnio-nio,api,core,protocol.basic,testing-support,util,protocol.basic.test.compile"> - <antcall inheritall="true" inheritrefs="true" target="protocol.basic.test.pseudotarget"> + <target name="protocol.multiplex.test" depends="lib.xnio-nio,api,core,protocol.multiplex,testing-support,util,protocol.multiplex.test.compile"> + <antcall inheritall="true" inheritrefs="true" target="protocol.multiplex.test.pseudotarget"> <param name="extension" value=".txt"/> <param name="message" value="Running with no security manager"/> <param name="test.jvmargs" value="-Ddummy=dummy"/> </antcall> - <antcall inheritall="true" inheritrefs="true" target="protocol.basic.test.pseudotarget"> + <antcall inheritall="true" inheritrefs="true" target="protocol.multiplex.test.pseudotarget"> <param name="extension" value="-security.txt"/> <param name="message" value="Running with security manager"/> <param name="test.jvmargs" value="-Djava.security.manager=org.jboss.remoting.test.support.LoggingSecurityManager -Djava.security.policy=${basedir}/testing-support/src/main/resources/testing.policy -Dsecurity.debug=policy"/> </antcall> </target> - <target name="protocol.basic.clean"> - <delete dir="protocol/basic/target"/> + <target name="protocol.multiplex.clean"> + <delete dir="protocol/multiplex/target"/> </target> - <target name="protocol.basic" description="Build the protocol.basic module" depends="lib.xnio-api,api,core,util,protocol.basic.compile"> - <path id="protocol.basic.classpath"> - <pathelement location="protocol/basic/target/main/classes"/> + <target name="protocol.multiplex" description="Build the protocol.multiplex module" depends="lib.xnio-api,api,core,util,protocol.multiplex.compile"> + <path id="protocol.multiplex.classpath"> + <pathelement location="protocol/multiplex/target/main/classes"/> </path> </target> @@ -1341,9 +1341,9 @@ <!-- core --> - <target name="all-core" description="Build all core targets" depends="api,compat,core,mc-deployers,protocol.basic,samples,standalone,testing-support,tools,util"/> + <target name="all-core" description="Build all core targets" depends="api,compat,core,mc-deployers,protocol.multiplex,samples,standalone,testing-support,tools,util"/> - <target name="clean-core" description="Clean all core targets" depends="api.clean,compat.clean,core.clean,mc-deployers.clean,protocol.basic.clean,samples.clean,standalone.clean,testing-support.clean,tools.clean,util.clean"/> + <target name="clean-core" description="Clean all core targets" depends="api.clean,compat.clean,core.clean,mc-deployers.clean,protocol.multiplex.clean,samples.clean,standalone.clean,testing-support.clean,tools.clean,util.clean"/> <!-- http --> @@ -1365,6 +1365,6 @@ <target name="clean" description="Clean out all build files" depends="clean-core,clean-http,version.clean,srp.clean"/> - <target name="test" description="Run all tests" depends="api.test,core.test,protocol.basic.test"/> + <target name="test" description="Run all tests" depends="api.test,core.test,protocol.multiplex.test"/> </project>