You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2004/11/19 19:23:35 UTC
svn commit: r105840 - incubator/apollo/trunk
Author: ips
Date: Fri Nov 19 10:23:34 2004
New Revision: 105840
Modified:
incubator/apollo/trunk/maven.xml
Log:
fixed classpath in forrest goal
Modified: incubator/apollo/trunk/maven.xml
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Fri Nov 19 10:23:34 2004
@@ -12,7 +12,7 @@
xmlns:maven="jelly:maven">
<property environment="env" />
-
+
<preGoal name="java:prepare-filesystem">
<j:if test="${context.getVariable('maven.ajar.src.enabled')}" >
<attainGoal name="ajar:update-src" />
@@ -22,37 +22,37 @@
</j:if>
<j:if test="${context.getVariable('idea.project.iml') != null}" >
<attainGoal name="idea-update" />
- </j:if>
+ </j:if>
</preGoal>
<preGoal name="java:compile">
<javac srcdir="${maven.src.dir}/java" destdir="${maven.build.dest}" classpath="${java.home}/../lib/tools.jar">
<include name="org/apache/ws/util/i18n/ResourcePropertiesGeneratorDoclet.java" />
- </javac>
+ </javac>
</preGoal>
-
+
<postGoal name="java:compile">
- <attainGoal name="generate-resource-bundles" />
+ <attainGoal name="generate-resource-bundles" />
</postGoal>
<!-- =================================================================== -->
<!-- "generate-resource-bundles" - generates resource bundles for I18n -->
- <!-- =================================================================== -->
+ <!-- =================================================================== -->
<goal name="generate-resource-bundles"
description="generates resource bundles for I18n">
-
- <javadoc protected="true"
- destdir="${maven.build.dest}"
- failonerror="true">
- <classpath>
+
+ <javadoc protected="true"
+ destdir="${maven.build.dest}"
+ failonerror="true">
+ <classpath>
<pathelement path="${maven.build.dest}" />
<pathelement path="${java.home}/../lib/tools.jar" />
<path refid="maven.dependency.classpath" />
</classpath>
- <doclet name="org.apache.ws.util.i18n.ResourcePropertiesGeneratorDoclet"
+ <doclet name="org.apache.ws.util.i18n.ResourcePropertiesGeneratorDoclet"
path="${maven.build.dest}" />
<packageset dir="${maven.src.dir}/java" defaultexcludes="yes">
- <include name="org/apache/ws/**" />
+ <include name="org/apache/ws/**" />
</packageset>
</javadoc>
</goal>
@@ -65,17 +65,19 @@
<java classname="org.apache.tools.ant.Main"
fork="true"
failonerror="true"
- maxmemory="128M">
+ maxmemory="128M">
<classpath>
- <fileset dir="${forrest.ant.home}/lib">
- <include name="*.jar" />
+ <fileset dir="${forrest.install.dir}/lib/endorsed">
+ <include name="*.jar" />
</fileset>
<pathelement path="${java.home}/../lib/tools.jar" />
+ <fileset dir="${forrest.ant.home}/lib">
+ <include name="*.jar" />
+ </fileset>
</classpath>
<sysproperty key="ant.home" value="${forrest.ant.home}" />
<sysproperty key="forrest.home" value="${forrest.home}" />
<sysproperty key="basedir" value="${basedir}" />
- <sysproperty key="java.endorsed.dirs" value="${forrest.install.dir}/lib/endorsed" />
<arg line="-f ${forrest.home}/forrest.build.xml" />
</java>
</goal>
@@ -83,7 +85,7 @@
<postGoal name="test:compile">
<copy todir="${maven.test.dest}">
<fileset dir="${maven.src.dir}/test" excludes="**/*.java, **/package.html" />
- </copy>
+ </copy>
</postGoal>
<postGoal name="jar:jar">
@@ -92,19 +94,19 @@
<mkdir dir="${maven.war.webapp.dir}/WEB-INF/lib" />
<copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.war.webapp.dir}/WEB-INF/lib" />
</postGoal>
-
+
<!-- ================================================================== -->
<!-- W A R : W E B A P P -->
<!-- P O S T - G O A L -->
<!-- ================================================================== -->
- <postGoal name="war:webapp">
-
+ <postGoal name="war:webapp">
+
<!-- Delete the J-WSRF classes that war:webapp copied into WEB-INF/classes/. -->
<delete><fileset dir="${maven.war.webapp.dir}/WEB-INF/classes" excludes="*.*, wsdl" /></delete>
- <!-- Build J-WSRF jar and copy it into WEB-INF/lib/. -->
+ <!-- Build J-WSRF jar and copy it into WEB-INF/lib/. -->
<j:set var="maven.test.skip" value="true" />
- <attainGoal name="jar:jar" />
+ <attainGoal name="jar:jar" />
<copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.war.webapp.dir}/WEB-INF/lib" overwrite="true" verbose="true" />
<!-- Copy spec WSDLs into spec/ subdir of webapp docroot. -->
@@ -113,9 +115,9 @@
<copy todir="${spec.wsdl.deploy.dir}">
<fileset dir="${maven.src.dir}/wsdl/spec" />
</copy>
-
+
</postGoal>
-
+
<!-- ================================================================== -->
<!-- D I S T : P R E P A R E - B I N - F I L E S Y S T E M -->
<!-- P O S T - G O A L -->
@@ -124,14 +126,14 @@
<!-- Delete the project jar that dist:prepare-bin-filesystem placed
in the dist dir. -->
- <delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
-
+ <delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
+
<attainGoal name="docs" />
<mkdir dir="${maven.dist.bin.assembly.dir}/docs" />
<copy todir="${maven.dist.bin.assembly.dir}/docs">
<fileset dir="${basedir}/build/site" />
</copy>
-
+
<mkdir dir="${maven.dist.bin.assembly.dir}/examples" />
<copy todir="${maven.dist.bin.assembly.dir}/examples">
<fileset dir="${basedir}/examples" />
@@ -139,21 +141,21 @@
<delete dir="${maven.dist.bin.assembly.dir}/examples/filesystem/generated" />
<mkdir dir="${maven.dist.bin.assembly.dir}/usr" />
-
+
<attainGoal name="war:webapp" />
- <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/wsrf" />
+ <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/wsrf" />
<copy todir="${maven.dist.bin.assembly.dir}/webapps/wsrf">
<fileset dir="${maven.war.webapp.dir}" />
- </copy>
-
+ </copy>
+
<copy todir="${maven.dist.bin.assembly.dir}">
<fileset dir="${basedir}">
<include name="README.htm" />
</fileset>
</copy>
-
+
</postGoal>
-
+
<!-- ================================================================== -->
<!-- D I S T : P R E P A R E - S R C - F I L E S Y S T E M -->
<!-- P O S T - G O A L -->
@@ -161,8 +163,8 @@
<postGoal name="dist:prepare-src-filesystem">
<!-- Delete the faulty maven-ant-plugin-generated build.xml, forcing
use of Maven to build our sources. -->
- <delete file="${maven.dist.src.assembly.dir}/build.xml" />
- </postGoal>
+ <delete file="${maven.dist.src.assembly.dir}/build.xml" />
+ </postGoal>
<!-- ================================================================== -->
<!-- D I S T : B U I L D -->
@@ -171,18 +173,18 @@
<postGoal name="dist:build">
<!-- Delete the tar.gz dist files, as we only want the zip dists. -->
<delete>
- <fileset dir="${maven.dist.dir}"><include name="*.tar.gz" /></fileset>
+ <fileset dir="${maven.dist.dir}"><include name="*.tar.gz" /></fileset>
</delete>
</postGoal>
-
- <goal name="prep" prereqs="java:prepare-filesystem" />
- <goal name="compile" prereqs="java:compile" />
+
+ <goal name="prep" prereqs="java:prepare-filesystem" />
+ <goal name="compile" prereqs="java:compile" />
<goal name="webapp" prereqs="war:webapp" />
-
+
<goal name="dos2ux">
<fixcrlf srcdir="${basedir}"
eol="lf"
includes="src/wsdl/**, src/bindings/**" />
</goal>
-
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org