Author: bdaw Date: 2007-10-23 13:59:29 -0400 (Tue, 23 Oct 2007) New Revision: 8764 Added: modules/test/trunk/remote/src/main/java/ modules/test/trunk/remote/src/main/java/org/ modules/test/trunk/remote/src/main/java/org/jboss/ modules/test/trunk/remote/src/main/java/org/jboss/unit/ modules/test/trunk/remote/src/main/resources/ modules/test/trunk/remote/src/main/resources/org/ modules/test/trunk/remote/src/test/ modules/test/trunk/remote/src/test/java/ modules/test/trunk/remote/src/test/java/org/ modules/test/trunk/remote/src/test/java/org/jboss/ modules/test/trunk/remote/src/test/java/org/jboss/test/ modules/test/trunk/remote/src/test/resources/ Removed: modules/test/trunk/remote/src/main/org/jboss/test/ modules/test/trunk/remote/src/main/org/jboss/unit/ modules/test/trunk/remote/src/resources/ Modified: modules/test/trunk/remote/build.xml Log: remote module reorganization for maven Modified: modules/test/trunk/remote/build.xml =================================================================== --- modules/test/trunk/remote/build.xml 2007-10-23 16:34:20 UTC (rev 8763) +++ modules/test/trunk/remote/build.xml 2007-10-23 17:59:29 UTC (rev 8764) @@ -136,6 +136,29 @@ _default:compile-etc, _default:compile-resources"> <!-- Add module specific elements here. --> + + <!-- Workaround to include test classes from maven convention --> + + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + source="${javac.source}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${maven.module.test.sources}"/> + <classpath> + <path refid="javac.classpath"/> + <pathelement location="${build.classes}"/> + </classpath> + + <include name="${javac.includes}"/> + </javac> + </target> <!--+====================================================================+--> @@ -156,9 +179,16 @@ <fileset dir="${build.classes}"> <exclude name="org/jboss/test/**"/> </fileset> - <fileset dir="${build.resources}/jboss-unit-remote-jar"/> + <fileset dir="${maven.module.resources}"/> </jar> + <jar jarfile="${build.lib}/jboss-unit-remote-test.jar"> + <fileset dir="${build.classes}"> + <exclude name="org/jboss/unit/**"/> + </fileset> + <fileset dir="${maven.module.test.resources}"/> + </jar> + </target> <!-- ================================================================== --> @@ -200,6 +230,8 @@ <path location="${build.lib}/jboss-unit-lib.jar"/> <path location="${build.lib}/jboss-unit-test.jar"/> <path location="${build.resources}/test"/> + + <path location="${build.lib}/jboss-unit-remote-test.jar"/> </classpath> </java> Copied: modules/test/trunk/remote/src/main/java/org/jboss/unit (from rev 8752, modules/test/trunk/remote/src/main/org/jboss/unit) Copied: modules/test/trunk/remote/src/main/resources/org (from rev 8752, modules/test/trunk/remote/src/resources/jboss-unit-remote-jar/org) Copied: modules/test/trunk/remote/src/test/java/org/jboss/test (from rev 8752, modules/test/trunk/remote/src/main/org/jboss/test)