taylor 2004/04/21 11:55:01
Modified: . maven.xml
Log:
added deploy goal
fixed hotdeploy to not always regenerate castor xsd files
Revision Changes Path
1.16 +34 -12 jakarta-jetspeed/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/maven.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- maven.xml 20 Apr 2004 01:30:10 -0000 1.15
+++ maven.xml 21 Apr 2004 18:55:01 -0000 1.16
@@ -115,7 +115,7 @@
<echo>[DEBUG] maven.war.src = ${maven.war.src}</echo>
<echo>[DEBUG] maven.build.dir = ${maven.build.dir}</echo>
<echo>[DEBUG] maven.war.build.dir = ${maven.war.build.dir}</echo-->
- <copy
todir="${maven.war.appserver.home}/webapps/${pom.name}/WEB-INF/classes">
+ <copy
todir="${maven.war.appserver.home}/webapps/${pom.artifactId}/WEB-INF/classes">
<fileset dir="${maven.build.dir}/classes">
<!-- Do not include test files in the runtime jar -->
<exclude name="**/Test*.*"/>
@@ -124,7 +124,7 @@
<exclude name="cactus.properties"/>
</fileset>
</copy>
- <copy todir="${maven.war.appserver.home}/webapps/${pom.name}">
+ <copy todir="${maven.war.appserver.home}/webapps/${pom.artifactId}">
<fileset dir="./webapp">
<exclude name="**/*.properties.merge"/>
</fileset>
@@ -147,16 +147,7 @@
package="org.apache.jetspeed.xml.api.jcm"
marshal="true"/>
-->
- <java classname="org.exolab.castor.builder.SourceGenerator" fork="yes">
- <classpath refid="maven.dependency.classpath"/>
- <arg value="-i"/>
- <arg value="${maven.src.dir}/xml/jetspeed-portal-content.xsd"/>
- <arg value="-f"/>
- <arg value="-dest"/>
- <arg value="${maven.src.dir}/java"/>
- <arg value="-package"/>
- <arg value="org.apache.jetspeed.xml.api.jcm"/>
- </java>
+ <attainGoal name="prepare.apis"/>
<attainGoal name="torque:om"/>
</preGoal>
<!-- ================================================================== -->
@@ -251,4 +242,35 @@
</fileset>
</copy>
</preGoal>
+
+ <goal name="deploy" description="Deploys jetspeed.war on a local server">
+ <delete dir="${maven.war.appserver.home}/webapps/${pom.artifactId}"/>
+ <copy file="${maven.build.dir}/${pom.artifactId}.war"
todir="${maven.war.appserver.home}/webapps/">
+ </copy>
+ <unwar src="${maven.war.appserver.home}/webapps/${pom.artifactId}.war"
dest="${maven.war.appserver.home}/webapps/${pom.artifactId}"/>
+ </goal>
+
+ <goal name="prepare.apis">
+ <uptodate
+ property="apis.uptodate"
+
targetfile="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar"
+ >
+ <srcfiles dir="${maven.src.dir}/xml" includes="**/*.xsd"/>
+ </uptodate>
+ <j:set var="castorflag" value="${apis.uptodate}"/>
+ <j:if test="${castorflag != 'true'}">
+ <echo>Generating Jetspeed XML bindings</echo>
+ <java classname="org.exolab.castor.builder.SourceGenerator"
fork="yes">
+ <classpath refid="maven.dependency.classpath"/>
+ <arg value="-i"/>
+ <arg
value="${maven.src.dir}/xml/jetspeed-portal-content.xsd"/>
+ <arg value="-f"/>
+ <arg value="-dest"/>
+ <arg value="${maven.src.dir}/java"/>
+ <arg value="-package"/>
+ <arg value="org.apache.jetspeed.xml.api.jcm"/>
+ </java>
+ </j:if>
+ </goal>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
