Author: bdaw Date: 2007-10-23 12:33:44 -0400 (Tue, 23 Oct 2007) New Revision: 8762 Added: modules/test/trunk/mc/src/main/java/ modules/test/trunk/mc/src/main/java/org/ modules/test/trunk/mc/src/main/java/org/jboss/ modules/test/trunk/mc/src/main/java/org/jboss/unit/ modules/test/trunk/mc/src/main/resources/ modules/test/trunk/mc/src/test/ modules/test/trunk/mc/src/test/java/ modules/test/trunk/mc/src/test/java/org/ modules/test/trunk/mc/src/test/java/org/jboss/ modules/test/trunk/mc/src/test/java/org/jboss/test/ modules/test/trunk/mc/src/test/resources/ modules/test/trunk/mc/src/test/resources/blah/ Removed: modules/test/trunk/mc/src/main/org/ modules/test/trunk/mc/src/resources/ Modified: modules/test/trunk/mc/build.xml Log: mc module reorganization for maven structure Modified: modules/test/trunk/mc/build.xml =================================================================== --- modules/test/trunk/mc/build.xml 2007-10-23 16:26:21 UTC (rev 8761) +++ modules/test/trunk/mc/build.xml 2007-10-23 16:33:44 UTC (rev 8762) @@ -128,6 +128,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> <!--+====================================================================+--> @@ -148,12 +171,14 @@ <fileset dir="${build.classes}"> <exclude name="org/jboss/test/**"/> </fileset> + <fileset dir="${maven.module.resources}"/> </jar> <jar jarfile="${build.lib}/jboss-unit-mc-test.jar"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/**"/> + <exclude name="org/jboss/unit/**"/> </fileset> + <fileset dir="${maven.module.test.resources}"/> </jar> </target> Copied: modules/test/trunk/mc/src/main/java/org/jboss/unit (from rev 8752, modules/test/trunk/mc/src/main/org/jboss/unit) Copied: modules/test/trunk/mc/src/test/java/org/jboss/test (from rev 8752, modules/test/trunk/mc/src/main/org/jboss/test) Copied: modules/test/trunk/mc/src/test/resources/blah (from rev 8752, modules/test/trunk/mc/src/resources/test/blah)