[portal-commits] JBoss Portal SVN: r8755 - in modules/test/trunk/unit: src and 10 other directories.

Author: bdaw Date: 2007-10-23 11:46:18 -0400 (Tue, 23 Oct 2007) New Revision: 8755 Added: modules/test/trunk/unit/pom.xml modules/test/trunk/unit/src/main/java/ modules/test/trunk/unit/src/main/java/org/ modules/test/trunk/unit/src/main/java/org/jboss/ modules/test/trunk/unit/src/main/java/org/jboss/unit/ modules/test/trunk/unit/src/main/resources/ modules/test/trunk/unit/src/main/resources/org/ modules/test/trunk/unit/src/test/ modules/test/trunk/unit/src/test/java/ modules/test/trunk/unit/src/test/java/org/ modules/test/trunk/unit/src/test/java/org/jboss/ modules/test/trunk/unit/src/test/java/org/jboss/test/ modules/test/trunk/unit/src/test/resources/ modules/test/trunk/unit/src/test/resources/org/ Removed: modules/test/trunk/unit/src/main/org/ modules/test/trunk/unit/src/resources/ Modified: modules/test/trunk/unit/build.xml Log: - unit submodule reorganization for maven structure Modified: modules/test/trunk/unit/build.xml =================================================================== --- modules/test/trunk/unit/build.xml 2007-10-23 15:44:23 UTC (rev 8754) +++ modules/test/trunk/unit/build.xml 2007-10-23 15:46:18 UTC (rev 8755) @@ -124,6 +124,30 @@ _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> <!--+====================================================================+--> @@ -144,13 +168,14 @@ <fileset dir="${build.classes}"> <exclude name="org/jboss/test/**"/> </fileset> - <fileset dir="${build.resources}/jboss-unit-jar"/> + <fileset dir="${maven.module.resources}"/> </jar> <jar jarfile="${build.lib}/jboss-unit-test.jar"> <fileset dir="${build.classes}"> <exclude name="org/jboss/unit/**"/> </fileset> + <fileset dir="${maven.module.test.resources}"/> </jar> </target> Added: modules/test/trunk/unit/pom.xml =================================================================== --- modules/test/trunk/unit/pom.xml (rev 0) +++ modules/test/trunk/unit/pom.xml 2007-10-23 15:46:18 UTC (rev 8755) @@ -0,0 +1,33 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-portal-modules-test-root</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-portal-modules-test-unit</artifactId> + <packaging>jar</packaging> + <name>JBoss Portal Modules Common Portal</name> + + <dependencies/> + + <build> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + + </build> + + <properties> + + </properties> +</project> + Copied: modules/test/trunk/unit/src/main/java/org/jboss/unit (from rev 8752, modules/test/trunk/unit/src/main/org/jboss/unit) Copied: modules/test/trunk/unit/src/main/resources/org (from rev 8752, modules/test/trunk/unit/src/resources/jboss-unit-jar/org) Copied: modules/test/trunk/unit/src/test/java/org/jboss/test (from rev 8752, modules/test/trunk/unit/src/main/org/jboss/test) Copied: modules/test/trunk/unit/src/test/resources/org (from rev 8752, modules/test/trunk/unit/src/resources/test/org)