Author: bdaw Date: 2007-11-02 09:29:42 -0400 (Fri, 02 Nov 2007) New Revision: 8820 Added: modules/test/trunk/tooling/ant/ modules/test/trunk/tooling/ant/pom.xml modules/test/trunk/tooling/ant/src/ modules/test/trunk/tooling/maven2/ modules/test/trunk/tooling/maven2/src/ modules/test/trunk/tooling/maven2/src/main/ modules/test/trunk/tooling/maven2/src/main/java/ modules/test/trunk/tooling/maven2/src/main/java/org/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/ modules/test/trunk/tooling/maven2/src/main/java/org/jboss/unit/tooling/maven2/ modules/test/trunk/tooling/maven2/src/main/resources/ Removed: modules/test/trunk/tooling/src/ Modified: modules/test/trunk/tooling/build.xml modules/test/trunk/tooling/pom.xml Log: tooling reorg for mvn Added: modules/test/trunk/tooling/ant/pom.xml =================================================================== --- modules/test/trunk/tooling/ant/pom.xml (rev 0) +++ modules/test/trunk/tooling/ant/pom.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -0,0 +1,49 @@ +<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-tooling</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-portal-modules-test-tooling-ant</artifactId> + <packaging>jar</packaging> + <name>JBoss Portal Modules Test Tooling Ant</name> + + <dependencies> + <dependency> + <groupId>ant</groupId> + <artifactId>ant-junit</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.test</groupId> + <artifactId>jboss-portal-modules-test-unit</artifactId> + <version>1.1.0-SNAPSHOT</version> + </dependency> + </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> \ No newline at end of file Copied: modules/test/trunk/tooling/ant/src (from rev 8819, modules/test/trunk/tooling/src) Modified: modules/test/trunk/tooling/build.xml =================================================================== --- modules/test/trunk/tooling/build.xml 2007-11-02 09:37:03 UTC (rev 8819) +++ modules/test/trunk/tooling/build.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -142,7 +142,7 @@ includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> - <src path="${maven.module.test.sources}"/> + <src path="./ant/src/main/java"/> <classpath> <path refid="javac.classpath"/> <pathelement location="${build.classes}"/> @@ -151,6 +151,26 @@ <include name="${javac.includes}"/> </javac> + <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="./ant/src/test/java"/> + <classpath> + <path refid="javac.classpath"/> + <pathelement location="${build.classes}"/> + </classpath> + + <include name="${javac.includes}"/> + </javac> + </target> <!--+====================================================================+--> @@ -241,7 +261,7 @@ <jboss-unit> - <tests config="./src/test/resources/simple-tests.xml" suiteName="one"> + <tests config="./ant/src/test/resources/simple-tests.xml" suiteName="one"> <!-- no include tag means invoke all --> <!-- but you can still exclude some tests --> <property name="propName" value="propValue"/> @@ -261,7 +281,7 @@ <exclude id="otherTestTwo"/> </tests> - <tests config="./src/test/resources/assertkeyword-unit.xml"> + <tests config="./ant/src/test/resources/assertkeyword-unit.xml"> </tests> <!--<tests config="./output/resources/test/simple-tests.xml"> Modified: modules/test/trunk/tooling/pom.xml =================================================================== --- modules/test/trunk/tooling/pom.xml 2007-11-02 09:37:03 UTC (rev 8819) +++ modules/test/trunk/tooling/pom.xml 2007-11-02 13:29:42 UTC (rev 8820) @@ -1,49 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> <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> + 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-tooling</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Test Tooling</name> + <modelVersion>4.0.0</modelVersion> + <artifactId>jboss-portal-modules-test-tooling</artifactId> + <packaging>pom</packaging> + <name>JBoss Portal Modules Test Tooling</name> + <modules> + <module>ant</module> + </modules> +</project> - <dependencies> - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.test</groupId> - <artifactId>jboss-portal-modules-test-unit</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - </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> \ No newline at end of file