1:32 p.m.
Author: bdaw
Date: 2008-01-02 14:32:05 -0500 (Wed, 02 Jan 2008)
New Revision: 9411
Modified:
modules/identity/trunk/build/pom.xml
modules/identity/trunk/identity/build.xml
modules/identity/trunk/identity/pom.xml
Log:
specify plugin version and other improvements...
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2008-01-02 18:25:20 UTC (rev 9410)
+++ modules/identity/trunk/build/pom.xml 2008-01-02 19:32:05 UTC (rev 9411)
@@ -90,6 +90,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -116,6 +117,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -125,6 +127,7 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
<executions>
<execution>
<id>make-assembly</id>
Modified: modules/identity/trunk/identity/build.xml
===================================================================
--- modules/identity/trunk/identity/build.xml 2008-01-02 18:25:20 UTC (rev 9410)
+++ modules/identity/trunk/identity/build.xml 2008-01-02 19:32:05 UTC (rev 9411)
@@ -1,10 +1,9 @@
<?xml version="1.0"?>
<project name="identity-test"
xmlns:artifact="urn:maven-artifact-ant">
- <target name="test">
+ <target name="test" depends="evaluate_properties"
unless="maven.test.skip">
- <!--<property name="jboss_home"
value="/home/bdaw/Workshop/JBoss/server/jboss-4.2.1.GA"/>-->
- <echo message="JBOSS_HOME= ${jboss_home}"/>
+ <echo message="JBOSS_HOME= ${JBOSS_HOME}"/>
<!--<echo message="compile classpath:
${compile_classpath}"/>-->
<!--<echo message="runtime classpath:
${runtime_classpath}"/>-->
@@ -35,6 +34,34 @@
</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_HOME"
value="${env.JBOSS_HOME}">
+ <and>
+ <isset property="env.JBOSS_HOME"/>
+ <not>
+ <isset property="JBOSS_HOME"/>
+ </not>
+ </and>
+ </condition>
+
+ <fail message="Please set the environment variable JBOSS_HOME or specify it
using -DJBOSS_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+
+ </target>
+
<target name="deploy-opends">
<!--Filterout opends.sar-->
@@ -70,18 +97,19 @@
<pathelement path="${plugin_classpath}"/>
</classpath>
</taskdef>
-
+
</target>
<target name="cargo.jboss-4.2.start" depends="cargo.setup">
- <!--output="${cargo.log.dir}/cargo.identity.server.log"-->
- <!--log="${cargo.log.dir}/cargo.identity.shutdown.log"-->
+
<cargo
containerId="jboss42x"
- home="${jboss_home}"
+ output="${cargo.log.dir}/cargo.identity.server.log"
+ log="${cargo.log.dir}/cargo.identity.shutdown.log"
+ home="${JBOSS_HOME}"
action="start"
wait="false">
<sharedClasspath>
@@ -96,11 +124,11 @@
<target name="cargo.jboss-4.2.stop" depends="cargo.setup">
- <!--log="${cargo.log.dir}/cargo.identity.startup.log"-->
+
<cargo
containerId="jboss42x"
- home="${jboss_home}"
-
+ home="${JBOSS_HOME}"
+ log="${cargo.log.dir}/cargo.identity.startup.log"
action="stop">
<configuration>
<property name="cargo.rmi.port" value="1099"/>
@@ -124,7 +152,7 @@
<classpath>
<pathelement path="${test_classpath}"/>
</classpath>
-
+
</jboss-unit>
</target>
Modified: modules/identity/trunk/identity/pom.xml
===================================================================
--- modules/identity/trunk/identity/pom.xml 2008-01-02 18:25:20 UTC (rev 9410)
+++ modules/identity/trunk/identity/pom.xml 2008-01-02 19:32:05 UTC (rev 9411)
@@ -33,6 +33,7 @@
<artifactId>jbosssx</artifactId>
</dependency>
+ <!--TEST SCOPE-->
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
@@ -154,28 +155,6 @@
<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</property>
- <message>"You must specify JBoss Application Server
installation directory using -DJBOSS_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>
@@ -199,14 +178,11 @@
<configuration>
<tasks>
- <!--<echo>JBOSS_HOME=${JBOSS_HOME}</echo>-->
<property name="compile_classpath"
refid="maven.compile.classpath"/>
<property name="runtime_classpath"
refid="maven.runtime.classpath"/>
<property name="test_classpath"
refid="maven.test.classpath"/>
<property name="plugin_classpath"
refid="maven.plugin.classpath"/>
- <property name="jboss_home"
value="${JBOSS_HOME}"/>
-
<property name="dependency.opends.sar"
value="${maven.dependency.org.jboss.unit.opends.sar.path}"/>
<ant antfile="${basedir}/build.xml">