2:30 p.m.
Author: bdaw
Date: 2008-01-02 15:30:18 -0500 (Wed, 02 Jan 2008)
New Revision: 9412
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/pom.xml
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/test/build.xml
Log:
improvements
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-01-02 19:32:05 UTC (rev 9411)
+++ modules/web/trunk/build/pom.xml 2008-01-02 20:30:18 UTC (rev 9412)
@@ -75,71 +75,74 @@
</properties>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
<repositories>
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2008-01-02 19:32:05 UTC (rev 9411)
+++ modules/web/trunk/pom.xml 2008-01-02 20:30:18 UTC (rev 9412)
@@ -26,6 +26,7 @@
</distributionManagement>
<modules>
+ <module>build</module>
<module>web</module>
</modules>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-01-02 19:32:05 UTC (rev 9411)
+++ modules/web/trunk/web/pom.xml 2008-01-02 20:30:18 UTC (rev 9412)
@@ -248,39 +248,14 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>JBOSS_HOME_4_2_1</property>
- <message>"You must specify JBoss Application Server
installation directory using -DJBOSS_HOME_4_2_1=... command line
argument"</message>
- </requireProperty>
- <requireProperty>
- <property>TOMCAT_6_0_HOME</property>
- <message>"You must specify Tomcat installation
directory using -DTOMCAT_6_0_HOME=... command line argument"</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
- <artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+ <artifactId>maven-antrun-extended-plugin</artifactId>
+ <version>1.9-SNAPSHOT</version>
- <dependencies>
+ <dependencies>
<!--Nessesary to force antrun plugin to support ant 1.7.0
features...-->
- <dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>${version.ant}</version>
@@ -296,8 +271,8 @@
<version>${version.jboss.unit}</version>
</dependency>
- <!-- stuff to run servers for tests -->
- <dependency>
+ <!-- stuff to run servers for tests -->
+ <dependency>
<groupId>cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>${version.cargo}</version>
@@ -322,9 +297,6 @@
<property name="test_classpath"
refid="maven.test.classpath"/>
<property name="plugin_classpath"
refid="maven.plugin.classpath"/>
- <property name="jboss_home"
value="${JBOSS_HOME_4_2_1}"/>
- <property name="tomcat_home"
value="${TOMCAT_6_0_HOME}"/>
-
<property name="project.version"
value="${project.version}"/>
<property name="dependency.concurrent.jar"
value="${maven.dependency.concurrent.concurrent.jar.path}"/>
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-01-02 19:32:05 UTC (rev 9411)
+++ modules/web/trunk/web/src/test/build.xml 2008-01-02 20:30:18 UTC (rev 9412)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<project name="identity-test"
xmlns:artifact="urn:maven-artifact-ant">
+<project name="identity-test">
- <target name="tests" depends="prepare_env">
+ <target name="tests" depends="prepare_env, evaluate_properties"
unless="maven.test.skip">
<echo message="compile classpath: ${compile_classpath}"/>
<echo message="runtime classpath: ${runtime_classpath}"/>
@@ -10,6 +10,7 @@
<antcall target="package-tests"/>
+
<antcall target="tests.local"/>
<antcall target="tests.jboss-4.2"/>
<antcall target="tests.tomcat-6"/>
@@ -30,11 +31,64 @@
<property name="test.temp.lib"
value="${test.temp.dir}/lib"/>
<property name="test.support"
value="${test.temp.dir}/support"/>
- <property name="jboss-4.2.0.home"
value="${jboss_home}"/>
- <property name="tomcat-6.0.home"
value="${tomcat_home}"/>
-
</target>
+ <!--Lets make the check in one place so the build fail in the beggining instead of
end-->
+ <target name="evaluate_properties">
+
+ <property environment="env"/>
+
+ <!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_1_HOME"
value="${env.JBOSS_4_2_1_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_1_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="JBOSS_4_2_0_HOME"
value="${env.JBOSS_4_2_0_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_0_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="TOMCAT_6_0_HOME"
value="${env.TOMCAT_6_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_6_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+
+ <fail message="Please set the environment variable JBOSS_4_2_0_HOME or
JBOSS_4_2_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_4_2_0_HOME"/>
+ </not>
+ <not>
+ <isset property="JBOSS_4_2_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+ <fail message="Please set the environment variable
TOMCAT_6_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="TOMCAT_6_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+ </target>
+
<target name="package-tests">
<copy todir="${test.support}">
@@ -398,59 +452,46 @@
</target>
<target name="tests.jboss-4.2">
- <fail message="Please set the environment variable JBOSS_4_2_0_HOME or
JBOSS_4_2_1_HOME">
- <condition>
- <and>
- <not>
- <isset property="jboss-4.2.0.home"/>
- </not>
- <not>
- <isset property="jboss-4.2.1.home"/>
- </not>
- </and>
- </condition>
- </fail>
<antcall target="tests.jboss-4.2.container-servlet">
<param name="test.id"
value="JBoss-4_2_0-spi-container-servlet"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_0"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.0.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.0.home"/>
-
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_0_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/>
</antcall>
<antcall target="tests.jboss-4.2.container-servlet">
<param name="test.id"
value="JBoss-4_2_1-spi-container-servlet"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_1"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.1.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.1.home"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_1_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/>
</antcall>
<antcall target="tests.jboss-4.2.generic">
<param name="test.id"
value="JBoss-4_2_0-spi-generic"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_0"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.0.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.0.home"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_0_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/>
</antcall>
<antcall target="tests.jboss-4.2.generic">
<param name="test.id"
value="JBoss-4_2_1-spi-generic"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_1"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.1.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.1.home"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_1_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/>
</antcall>
<antcall target="tests.jboss-4.2.container-servlet">
<param name="test.id"
value="JBoss-4_2_0-request-container-servlet"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_0"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.0.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.0.home"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_0_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/>
</antcall>
<antcall target="tests.jboss-4.2.container-servlet">
<param name="test.id"
value="JBoss-4_2_1-request-container-servlet"/>
<param name="test.jboss-4.2.name"
value="RemoteJBoss_4_2_1"/>
- <param name="test.jboss-4.2.home"
value="${jboss-4.2.1.home}"/>
- <param name="test.jboss-4.2.home.variable-name"
value="jboss-4.2.1.home"/>
+ <param name="test.jboss-4.2.home"
value="${JBOSS_4_2_1_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name"
value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/>
</antcall>
</target>
@@ -458,12 +499,11 @@
<target name="cargo.tomcat-6.start" depends="cargo.setup">
- <!--output="${cargo.log.dir}/cargo.${test.id}.server.log"-->
- <!--log="${cargo.log.dir}/cargo.${test.id}.start.log"-->
<cargo
containerId="tomcat5x"
home="${test.tomcat-6.home}"
-
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
action="start"
wait="${cargo.wait}">
<sharedClasspath>
@@ -527,34 +567,25 @@
</target>
<target name="tests.tomcat-6">
- <fail message="Please set the environment variable
TOMCAT_6_0_HOME">
- <condition>
- <and>
- <not>
- <isset property="tomcat-6.0.home"/>
- </not>
- </and>
- </condition>
- </fail>
<antcall target="tests.tomcat-6.container-servlet">
<param name="test.id"
value="Tomcat-6_0-spi-container-servlet"/>
<param name="test.tomcat-6.name"
value="RemoteTomcat_6_0"/>
- <param name="test.tomcat-6.home"
value="${tomcat-6.0.home}"/>
- <param name="test.tomcat-6.home.variable-name"
value="tomcat-6.0.home"/>
+ <param name="test.tomcat-6.home"
value="${TOMCAT_6_0_HOME}"/>
+ <param name="test.tomcat-6.home.variable-name"
value="OMCAT_6_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/>
</antcall>
<antcall target="tests.tomcat-6.generic">
<param name="test.id"
value="Tomcat-6_0-spi-generic"/>
<param name="test.tomcat-6.name"
value="RemoteTomcat_6_0"/>
- <param name="test.tomcat-6.home"
value="${tomcat-6.0.home}"/>
- <param name="test.tomcat-6.home.variable-name"
value="tomcat-6.0.home"/>
+ <param name="test.tomcat-6.home"
value="${TOMCAT_6_0_HOME}"/>
+ <param name="test.tomcat-6.home.variable-name"
value="OMCAT_6_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/tomcat-6.0-generic/test-spi-server.war"/>
</antcall>
<antcall target="tests.tomcat-6.container-servlet">
<param name="test.id"
value="Tomcat-6_0-request-container-servlet"/>
<param name="test.tomcat-6.name"
value="RemoteTomcat_6_0"/>
- <param name="test.tomcat-6.home"
value="${tomcat-6.0.home}"/>
- <param name="test.tomcat-6.home.variable-name"
value="tomcat-6.0.home"/>
+ <param name="test.tomcat-6.home"
value="${TOMCAT_6_0_HOME}"/>
+ <param name="test.tomcat-6.home.variable-name"
value="OMCAT_6_0_HOME"/>
<param name="test.archive.path"
value="${test.temp.lib}/tomcat-6.0-container-servlet/test-request-server.war"/>
</antcall>
</target>