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/12/01 16:04:33 UTC
svn commit: r109347 - /incubator/apollo/trunk/forrest.properties /incubator/apollo/trunk/gump.xml /incubator/apollo/trunk/maven.xml /incubator/apollo/trunk/project.properties
Author: ips
Date: Wed Dec 1 07:04:31 2004
New Revision: 109347
URL: http://svn.apache.org/viewcvs?view=rev&rev=109347
Log:
various
Modified:
incubator/apollo/trunk/forrest.properties
incubator/apollo/trunk/gump.xml
incubator/apollo/trunk/maven.xml
incubator/apollo/trunk/project.properties
Modified: incubator/apollo/trunk/forrest.properties
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/forrest.properties?view=diff&rev=109347&p1=incubator/apollo/trunk/forrest.properties&r1=109346&p2=incubator/apollo/trunk/forrest.properties&r2=109347
==============================================================================
--- incubator/apollo/trunk/forrest.properties (original)
+++ incubator/apollo/trunk/forrest.properties Wed Dec 1 07:04:31 2004
@@ -32,12 +32,11 @@
#project.status=status.xml
project.build-dir = ${basedir}/target/forrest
-project.site-dir = ${project.build-dir}/docs
+project.site-dir = ${basedir}/../site
#project.war = ${project.build-dir}/${project.name}.war
#project.webapp = ${project.build-dir}/webapp
-
-#project.content-dir=src/documentation
+project.content-dir=src/site
#project.raw-content-dir=${project.content-dir}/content
#project.conf-dir=${project.content-dir}/conf
#project.sitemap-dir=${project.content-dir}
Modified: incubator/apollo/trunk/gump.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/gump.xml?view=diff&rev=109347&p1=incubator/apollo/trunk/gump.xml&r1=109346&p2=incubator/apollo/trunk/gump.xml&r2=109347
==============================================================================
--- incubator/apollo/trunk/gump.xml (original)
+++ incubator/apollo/trunk/gump.xml Wed Dec 1 07:04:31 2004
@@ -20,41 +20,47 @@
<description>Apollo Project</description>
<url href="http://incubator.apache.org/apollo/" />
- <cvs repository="" />
+ <svn repository="apache-incubator-svn" dir="apollo/trunk"/>
<project name="apollo">
+
<maven goal="jar">
<property name="final.name" value="apollo-@@DATE@@" />
</maven>
<package>org.apache.ws.resource</package>
- <depend project="addressing" />
- <depend project="apollo" />
- <depend project="commonj" />
+
+ <depend project="ant" />
+ <!--<depend project="commonj" />-->
<depend project="commons-cli" />
<depend project="commons-collections" />
<depend project="commons-digester" />
- <depend project="commons-discovery" />
+ <!--<depend project="commons-discovery" />-->
<depend project="commons-httpclient" />
<depend project="commons-lang" />
<depend project="commons-logging" />
- <depend project="concurrent" />
- <depend project="jakarta-ant" />
- <depend project="jakarta-log4j" />
- <depend project="jakarta-servletapi" />
- <depend project="jakarta-tomcat" />
- <depend project="jaxen" />
+ <!--<depend project="concurrent" />-->
<depend project="junit" />
- <depend project="ws-fx" />
- <depend project="xml-axis" />
- <depend project="xml-resolver" />
- <depend project="xml-xalan2" />
- <depend project="xml-xerces" />
- <depend project="xmlbeans" />
+ <depend project="logging-log4j" />
+ <depend project="packaged-jaxen" />
+ <depend project="tomcat-catalina" />
+ <depend project="ws-axis" />
+ <!--<depend project="xml-resolver" />-->
+ <depend project="xml-xalan" />
+ <depend project="xml-xerces2" />
+ <depend project="xml-xmlbeans" />
+
+ <!-- work dirs to be included in classpath -->
<work nested="target/classes" />
+
<home nested="target" />
+
+ <!-- jar(s) produced by the build -->
<jar name="apollo-@@DATE@@.jar" />
+
+ <license name="LICENSE.txt" />
<javadoc nested="target/docs/apidocs" />
<nag to="apollo-dev@ws.apache.org" from="Apollo Development <apollo-dev@ws.apache.org>" />
+
</project>
</module>
Modified: incubator/apollo/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/maven.xml?view=diff&rev=109347&p1=incubator/apollo/trunk/maven.xml&r1=109346&p2=incubator/apollo/trunk/maven.xml&r2=109347
==============================================================================
--- incubator/apollo/trunk/maven.xml (original)
+++ incubator/apollo/trunk/maven.xml Wed Dec 1 07:04:31 2004
@@ -34,6 +34,16 @@
<postGoal name="java:compile">
<attainGoal name="generate-resource-bundles" />
</postGoal>
+
+ <postGoal name="test:compile">
+ <copy todir="${maven.test.dest}">
+ <fileset dir="${maven.src.dir}/test" excludes="**/*.java, **/package.html" />
+ </copy>
+ </postGoal>
+
+ <postGoal name="test:test">
+ <j:set var="maven.test.skip" value="true" />
+ </postGoal>
<!-- =================================================================== -->
<!-- "generate-resource-bundles" - generates resource bundles for I18n -->
@@ -58,7 +68,7 @@
</goal>
<goal name="website"
- description="generates project website / documentation using Forrest">
+ description="generates project website / docs using Forrest">
<echo>FORREST_HOME=${env.FORREST_HOME}</echo>
<property name="forrest.home" location="${env.FORREST_HOME}" />
<property name="forrest.install.dir" location="${forrest.home}/../.." />
@@ -78,20 +88,11 @@
</classpath>
<sysproperty key="ant.home" value="${forrest.ant.home}" />
<sysproperty key="forrest.home" value="${forrest.home}" />
- <sysproperty key="basedir" value="${basedir}" />
- <sysproperty key="project.site-dir" value="${basedir}/../site" />
- <sysproperty key="project.content-dir" value="src/site" />
- <sysproperty key="project.skin" value="forrest-site" />
+ <sysproperty key="basedir" value="${basedir}" />
<arg line="-f ${forrest.home}/forrest.build.xml" />
</java>
</goal>
- <postGoal name="test:compile">
- <copy todir="${maven.test.dest}">
- <fileset dir="${maven.src.dir}/test" excludes="**/*.java, **/package.html" />
- </copy>
- </postGoal>
-
<postGoal name="jar:jar">
<mkdir dir="${env.CATALINA_HOME}/webapps/wsrf/WEB-INF/lib" />
<copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${env.CATALINA_HOME}/webapps/wsrf/WEB-INF/lib" />
@@ -132,10 +133,10 @@
in the dist dir. -->
<delete file="${maven.dist.bin.assembly.dir}/${maven.final.name}.jar" />
- <attainGoal name="docs" />
+ <attainGoal name="website" />
<mkdir dir="${maven.dist.bin.assembly.dir}/docs" />
<copy todir="${maven.dist.bin.assembly.dir}/docs">
- <fileset dir="${basedir}/build/site" />
+ <fileset dir="${site.dest.dir}" />
</copy>
<mkdir dir="${maven.dist.bin.assembly.dir}/examples" />
Modified: incubator/apollo/trunk/project.properties
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.properties?view=diff&rev=109347&p1=incubator/apollo/trunk/project.properties&r1=109346&p2=incubator/apollo/trunk/project.properties&r2=109347
==============================================================================
--- incubator/apollo/trunk/project.properties (original)
+++ incubator/apollo/trunk/project.properties Wed Dec 1 07:04:31 2004
@@ -51,3 +51,4 @@
# MAVEN.XML GOALS
###################
+site.dest.dir = ${basedir}/../site
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org