[jboss-cvs] jboss-seam/seam-gen ...
Peter Muir
peter at bleepbleep.org.uk
Mon Sep 24 05:40:12 EDT 2007
User: pmuir
Date: 07/09/24 05:40:12
Modified: seam-gen build.xml
Log:
Refactor out default.build.properties
Revision Changes Path
1.95 +6 -16 jboss-seam/seam-gen/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-gen/build.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- build.xml 21 Sep 2007 15:55:48 -0000 1.94
+++ build.xml 24 Sep 2007 09:40:12 -0000 1.95
@@ -2,18 +2,13 @@
<project name="seam-gen" default="help" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <property name="seam.dir" value="${ant.file.seam-gen}/../../" />
+ <!-- Give user a chance to override without editing this file or typing -D -->
+ <!-- Order is important! -->
+ <property file="./build.properties" />
<!-- Build resources -->
- <property name="build.dir" value="${seam.dir}/build" />
- <property name="tmp.dir" value="${seam.dir}/classes" />
- <property name="lib.dir" value="${seam.dir}/lib" />
-
- <path id="maven-ant-tasks.classpath" path="${build.dir}/lib/maven-ant-tasks.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
-
- <import file="${build.dir}/utilities.build.xml" />
- <import file="${build.dir}/common.build.xml" />
+ <property name="seam.dir" value="${ant.file.seam-gen}/../../" />
+ <import file="${seam.dir}/build/common.build.xml" />
<target name="init">
<artifact:dependencies pathId="seam-gen.path">
@@ -46,11 +41,6 @@
</target>
<target name="init-properties" depends="init">
- <!-- Give user a chance to override without editing this file or typing -D -->
- <property file="./build.properties" />
-
- <!-- Import properties from seam itself -->
- <property file="../build.properties" />
<packageDirectory property="action.dir" package="action/${action.package}"/>
<packageDirectory property="model.dir" package="model/${model.package}"/>
More information about the jboss-cvs-commits
mailing list