dain 2004/04/03 17:20:10
Modified: etc maven.xml
Log:
More deployment code.
The base structure is in, and now we just need to expand it.
Also fixed a bunch of serialization errors.
Revision Changes Path
1.2 +5 -36 openejb/etc/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/etc/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 1 Mar 2004 05:22:07 -0000 1.1
+++ maven.xml 3 Apr 2004 22:20:10 -0000 1.2
@@ -100,7 +100,7 @@
<fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove"
tablength="4">
<include name="**/*.java"/>
</fixcrlf>
- <fixcrlf srcdir="${basedir}" eol="lf" eof="remove" tab="remove"
tablength="2">
+ <fixcrlf srcdir="${basedir}" eol="lf" eof="remove" tab="remove"
tablength="4">
<include name="**/*.xml"/>
<include name="**/*.html"/>
</fixcrlf>
@@ -114,7 +114,7 @@
<include name="**/*.xml"/>
<include name="**/*.html"/>
</fixcrlf>
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove"
tablength="2">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove"
tablength="4">
<include name="**/*.xml"/>
<include name="**/*.html"/>
</fixcrlf>
@@ -123,14 +123,14 @@
<!-- Cleanse xdocs -->
<j:set var="srcdir" value="${basedir}/src/xdocs"/>
<u:available file="${srcdir}">
- <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove"
tablength="2">
+ <fixcrlf srcdir="${srcdir}" eol="lf" eof="remove" tab="remove"
tablength="4">
<include name="**/*.xml"/>
<include name="**/*.html"/>
</fixcrlf>
</u:available>
<!-- Cleanse build files -->
- <fixcrlf srcdir="." eol="lf" tab="remove" eof="remove" tablength="2">
+ <fixcrlf srcdir="." eol="lf" tab="remove" eof="remove" tablength="4">
<include name="project.xml"/>
<include name="maven.xml"/>
</fixcrlf>
@@ -179,35 +179,4 @@
<ant:touch file="${basedir}/target/test-reports/tstamp"/>
</j:if>
</postGoal>
-
- <!-- generate packages ready to be deployed, if appropriate -->
- <postGoal name="jar:jar">
- <ant:available property="geronimoServicePresent"
file="${basedir}/src/etc/META-INF/geronimo-service.xml"/>
- <j:if test="${geronimoServicePresent == 'true'}">
- <ant:jar
destfile="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar">
- <fileset dir="${basedir}/target"
includes="${pom.artifactId}-${pom.currentVersion}.jar"/>
- <fileset dir="${basedir}/src/etc"
includes="META-INF/geronimo-service.xml"/>
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="dependency" value="${artifact.dependency}"/>
- <j:if test="${dependency.getProperty('package') == 'true'}">
- <ant:echo>Processing dependency: ${dependency.id}</ant:echo>
- <fileset file="${artifact.path}"/>
- </j:if>
- </j:forEach>
- </ant:jar>
- </j:if>
- </postGoal>
-
- <postGoal name="jar:install">
- <ant:available property="geronimoPackagePresent"
file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"/>
- <j:if test="${geronimoPackagePresent == 'true'}">
- <ant:property name="jardir__"
value="${maven.repo.local}/${pom.artifactDirectory}/jars"/>
- <ant:mkdir dir="${jardir__}"/>
- <ant:copy
-
file="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar"
- todir="${jardir__}"
- overwrite="true"
- />
- </j:if>
- </postGoal>
</project>
