dion 02/05/25 04:40:32
Modified: src/templates/build/plugins/j2ee build.xml
default.properties
Log:
no message
Revision Changes Path
1.5 +6 -7 jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 23 May 2002 09:02:24 -0000 1.4
+++ build.xml 25 May 2002 11:40:32 -0000 1.5
@@ -41,7 +41,7 @@
<equals arg1="${maven.j2ee.ejb.name}"
arg2="$${maven.j2ee.ejb.name}" />
</not>
- <available file="${maven.j2ee.ejb.ejb-xml}" type="file"/>
+ <available file="${maven.j2ee.ejb.conf.dir}" type="dir"/>
</and>
</condition>
</target>
@@ -215,9 +215,9 @@
|
| maven.j2ee.ejb.name = ${maven.j2ee.ejb.name}
|
- | and the following files exist:
+ | and the following directories exist:
|
- | ${maven.j2ee.ejb.ejb-xml}
+ | ${maven.j2ee.ejb.conf.dir}
+------------------------------------------------------------------------------
</fail>
</target>
@@ -225,8 +225,6 @@
<target name="ejb-init" if="maven.j2ee.ejb.ready">
- <dirname property="maven.j2ee.ejb.ejb-xml.dir"
file="${maven.j2ee.ejb.ejb-xml}"/>
- <basename property="maven.j2ee.ejb.ejb-xml.file"
file="${maven.j2ee.ejb.ejb-xml}"/>
<property name="maven.j2ee.ejb.target-base"
value="${maven.build.dir}/ejb/"/>
</target>
@@ -250,8 +248,9 @@
</metainf>
- <metainf dir="${maven.j2ee.ejb.ejb-xml.dir}">
- <include name="${maven.j2ee.ejb.ejb-xml.file}"/>
+ <metainf dir="${maven.j2ee.ejb.conf.dir}"
+ includes="${maven.j2ee.ejb.conf.includes}"
+ excludes="${maven.j2ee.ejb.conf.includes}">
</metainf>
1.3 +3 -1
jakarta-turbine-maven/src/templates/build/plugins/j2ee/default.properties
Index: default.properties
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 23 May 2002 09:02:24 -0000 1.2
+++ default.properties 25 May 2002 11:40:32 -0000 1.3
@@ -29,7 +29,9 @@
# Defaulted
-maven.j2ee.ejb.ejb-xml=${maven.conf.dir}/${maven.j2ee.ejb.name}/ejb-jar.xml
+maven.j2ee.ejb.conf.dir=${maven.conf.dir}/${maven.j2ee.ejb.name}/
+maven.j2ee.ejb.conf.includes=ejb-jar.xml
+maven.j2ee.ejb.conf.excludes=
maven.j2ee.ejb.includes=**
maven.j2ee.ejb.excludes=**/package.html
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>