dion 02/05/05 01:17:46
Modified: src/templates/build j2ee.properties build-j2ee.xml
Log:
no message
Revision Changes Path
1.5 +13 -13 jakarta-turbine-maven/src/templates/build/j2ee.properties
Index: j2ee.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/j2ee.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- j2ee.properties 2 May 2002 06:29:44 -0000 1.4
+++ j2ee.properties 5 May 2002 08:17:46 -0000 1.5
@@ -1,16 +1,16 @@
# properties file for build-j2ee.xml
-maven.build.war=${build.dir}/webapps
-maven.war.src=${src.dir}/webapps
-maven.war.content=${maven.war.src}/${maven.war.name}
+maven.j2ee.war.src=${src.dir}/webapps
+maven.j2ee.war.content=${maven.j2ee.war.src}/${maven.j2ee.war.name}
# classes are relative to build.dir
-maven.war.classes.includes=**
-maven.war.classes.excludes=**/package.html
+maven.j2ee.war.classes.includes=**
+maven.j2ee.war.classes.excludes=**/package.html
#jars are relative to lib.repo
-maven.war.lib.includes=*.jar
-maven.war.lib.excludes=
-maven.war.manifest=${conf.dir}/${maven.war.name}-MANIFEST.MF
-maven.war.webxml=${conf.dir}/${maven.war.name}-web.xml
-#maven.war.prepareBuildFile=build.xml
-#maven.war.prepareBuildTarget=maven:war:preProcess
-#maven.war.updateBuildFile=build.xml
-#maven.war.updateBuildTarget=maven:war:postProcess
+maven.j2ee.war.lib.includes=*.jar
+maven.j2ee.war.lib.excludes=
+# - not used any more. not sure if this is good/bad
+# maven.j2ee.war.manifest=${conf.dir}/${maven.j2ee.war.name}-MANIFEST.MF
+maven.j2ee.war.webxml=${conf.dir}/${maven.j2ee.war.name}-web.xml
+#maven.j2ee.war.prepareBuildFile=build.xml
+#maven.j2ee.war.prepareBuildTarget=maven:war:preProcess
+#maven.j2ee.war.updateBuildFile=build.xml
+#maven.j2ee.war.updateBuildTarget=maven:war:postProcess
1.5 +20 -20 jakarta-turbine-maven/src/templates/build/build-j2ee.xml
Index: build-j2ee.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/build-j2ee.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build-j2ee.xml 2 May 2002 06:29:44 -0000 1.4
+++ build-j2ee.xml 5 May 2002 08:17:46 -0000 1.5
@@ -15,15 +15,15 @@
<property file="${maven.home}/j2ee.properties"/>
<!-- Check all requirements are available -->
- <condition property="maven.war.ready">
+ <condition property="maven.j2ee.war.ready">
<and>
<not>
- <equals arg1="${maven.war.name}"
- arg2="$${maven.war.name}" />
+ <equals arg1="${maven.j2ee.war.name}"
+ arg2="$${maven.j2ee.war.name}" />
</not>
- <available file="${maven.war.src}" type="dir"/>
- <available file="${maven.war.content}" type="dir"/>
- <available file="${maven.war.webxml}" type="file"/>
+ <available file="${maven.j2ee.war.src}" type="dir"/>
+ <available file="${maven.j2ee.war.content}" type="dir"/>
+ <available file="${maven.j2ee.war.webxml}" type="file"/>
</and>
</condition>
</target>
@@ -37,51 +37,51 @@
#callback("postprocess-war")"
description="o Create a war file" />
- <target name="war-error" unless="maven.war.ready">
+ <target name="war-error" unless="maven.j2ee.war.ready">
<!-- extend this list with requirements as needed -->
<fail>
+------------------------------------------------------------------------------
|
| ERROR: One of the required properties for maven:war was not provided.
|
- | Please ensure that the property maven.war.name is defined:
+ | Please ensure that the property maven.j2ee.war.name is defined:
|
- | maven.war.name = ${maven.war.name}
+ | maven.j2ee.war.name = ${maven.j2ee.war.name}
|
| Please ensure that the following directories exist:
|
- | ${maven.war.src}
- | ${maven.war.content}
+ | ${maven.j2ee.war.src}
+ | ${maven.j2ee.war.content}
|
| and the following files:
|
- | ${maven.war.webxml}
+ | ${maven.j2ee.war.webxml}
+------------------------------------------------------------------------------
</fail>
</target>
- <target name="war-init" if="maven.war.ready">
+ <target name="war-init" if="maven.j2ee.war.ready">
<!-- nothing to do as of yet -->
</target>
- <target name="war-build" if="maven.war.ready">
+ <target name="war-build" if="maven.j2ee.war.ready">
<!-- make sure the source is compiled -->
<ant antfile="${maven.home}/build-maven.xml" target="compile" />
<!-- setup any required resources -->
<ant antfile="${maven.home}/build-maven.xml" target="jar-resources" />
- <echo>Building WAR ${maven.war.name}</echo>
+ <echo>Building WAR ${maven.j2ee.war.name}</echo>
- <war warfile="${build.dir}/${maven.war.name}.war"
- webxml="${maven.war.webxml}">
- <fileset dir="${maven.war.content}"/>
+ <war warfile="${build.dir}/${maven.j2ee.war.name}.war"
+ webxml="${maven.j2ee.war.webxml}">
+ <fileset dir="${maven.j2ee.war.content}"/>
<lib dir="${lib.repo}">
<patternset refid="classpath.patternset" />
</lib>
<classes dir="${build.dest}">
- <include name="${maven.war.classes.includes}" />
- <exclude name="${maven.war.classes.excludes}" />
+ <include name="${maven.j2ee.war.classes.includes}" />
+ <exclude name="${maven.j2ee.war.classes.excludes}" />
</classes>
<manifest>
<attribute name="Built-By" value="${user.name}" />
