CVS: jcontainer/loom/site maven.xml,1.8,1.9 project.xml,1.33,1.34
Peter Donald <pdonald-yCVjj/[email protected]> Wed, 3 Dec 2003 04:45:21 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/site
In directory hogshead.codehaus.org:/tmp/cvs-serv21491/site
Modified Files:
maven.xml project.xml
Log Message:
Styled codebase
Index: maven.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/site/maven.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maven.xml 1 Nov 2003 14:09:39 -0000 1.8
+++ maven.xml 3 Dec 2003 10:44:49 -0000 1.9
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<project default="main"
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:maven="jelly:maven"
- xmlns:util="jelly:util"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven"
+ xmlns:util="jelly:util"
xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary">
<goal name="main">
@@ -18,85 +18,85 @@
<attainGoal name="site:deploy"/>
</goal>
- <preGoal name="xdoc:init">
- <attainGoal name="aggregate-components-source"/>
- <attainGoal name="aggregate-plugins-xdocs"/>
- <ant:copy todir="${maven.docs.aggregated.src}" overwrite="true">
- <ant:fileset dir="${basedir}/xdocs"/>
- </ant:copy>
- </preGoal>
+ <preGoal name="xdoc:init">
+ <attainGoal name="aggregate-components-source"/>
+ <attainGoal name="aggregate-plugins-xdocs"/>
+ <ant:copy todir="${maven.docs.aggregated.src}" overwrite="true">
+ <ant:fileset dir="${basedir}/xdocs"/>
+ </ant:copy>
+ </preGoal>
- <postGoal name="xdoc:copy-user-resources">
- <ant:copy todir="${maven.build.dir}/docs/dtds" filtering="no">
- <ant:fileset dir="${basedir}/../engine/src/java/org/jcontainer/loom/components/util">
- <ant:include name="*.dtd"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
+ <postGoal name="xdoc:copy-user-resources">
+ <ant:copy todir="${maven.build.dir}/docs/dtds" filtering="no">
+ <ant:fileset dir="${basedir}/../engine/src/java/org/jcontainer/loom/components/util">
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
- <!-- Required since unitTest resources from POM are not copied,
- presumably because unitTestSourcesPresent is set to false somewhere -->
- <postGoal name="test:test-resources">
- <ant:copy todir="${maven.test.dest}" filtering="no">
- <ant:fileset dir="${maven.aggregated.src}/test">
- <ant:include name="**/*.xml"/>
- <ant:include name="**/*.xinfo"/>
- <ant:include name="**/*.java"/>
- </ant:fileset>
- </ant:copy>
- </postGoal>
+ <!-- Required since unitTest resources from POM are not copied,
+ presumably because unitTestSourcesPresent is set to false somewhere -->
+ <postGoal name="test:test-resources">
+ <ant:copy todir="${maven.test.dest}" filtering="no">
+ <ant:fileset dir="${maven.aggregated.src}/test">
+ <ant:include name="**/*.xml"/>
+ <ant:include name="**/*.xinfo"/>
+ <ant:include name="**/*.java"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
- <goal name="aggregate-plugins-xdocs">
- <ant:mkdir dir="${maven.docs.aggregated.src}"/>
- <j:set var="pluginsDir" value="${basedir}/../plugins"/>
- <j:set var="aggregatedDir" value="${maven.docs.aggregated.src}/plugins"/>
- <ant:fileScanner var="plugins">
- <ant:fileset dir="${pluginsDir}">
- <ant:include name="*/project.xml"/>
+ <goal name="aggregate-plugins-xdocs">
+ <ant:mkdir dir="${maven.docs.aggregated.src}"/>
+ <j:set var="pluginsDir" value="${basedir}/../plugins"/>
+ <j:set var="aggregatedDir" value="${maven.docs.aggregated.src}/plugins"/>
+ <ant:fileScanner var="plugins">
+ <ant:fileset dir="${pluginsDir}">
+ <ant:include name="*/project.xml"/>
</ant:fileset>
- </ant:fileScanner>
- <ant:copy todir="${aggregatedDir}">
- <ant:fileset dir="${pluginsDir}/xdocs"/>
- </ant:copy>
- <ant:copy todir="${maven.build.dir}/templates">
- <ant:fileset dir="src/templates"/>
- </ant:copy>
- <j:forEach items="${plugins.iterator()}" var="plugin">
- <maven:pom projectDescriptor="${plugin}" var="pluginPom"/>
- <j:set var="name" value="${plugin.parentFile.name}"/>
- <ant:copy todir="${aggregatedDir}/${name}">
- <ant:fileset dir="${pluginsDir}/${name}/xdocs"/>
- </ant:copy>
- <!-- Generate navigation with correct relative path -->
- <j:file name="${maven.build.dir}/templates/navigation.menu"
- omitXmlDeclaration="true"
- prettyPrint="true">
- <menu name="Overview">
- <item name="Goals" href="/plugins/${name}/goals.html" />
- <item name="Properties" href="/plugins/${name}/properties.html" />
- <item name="Tips" href="/plugins/${name}/tips.html"/>
- </menu>
- </j:file>
- <velocity:merge
- name="${aggregatedDir}/${name}/navigation.xml"
- basedir="${maven.build.dir}/templates"
- template="navigation.xml"/>
- </j:forEach>
- </goal>
+ </ant:fileScanner>
+ <ant:copy todir="${aggregatedDir}">
+ <ant:fileset dir="${pluginsDir}/xdocs"/>
+ </ant:copy>
+ <ant:copy todir="${maven.build.dir}/templates">
+ <ant:fileset dir="src/templates"/>
+ </ant:copy>
+ <j:forEach items="${plugins.iterator()}" var="plugin">
+ <maven:pom projectDescriptor="${plugin}" var="pluginPom"/>
+ <j:set var="name" value="${plugin.parentFile.name}"/>
+ <ant:copy todir="${aggregatedDir}/${name}">
+ <ant:fileset dir="${pluginsDir}/${name}/xdocs"/>
+ </ant:copy>
+ <!-- Generate navigation with correct relative path -->
+ <j:file name="${maven.build.dir}/templates/navigation.menu"
+ omitXmlDeclaration="true"
+ prettyPrint="true">
+ <menu name="Overview">
+ <item name="Goals" href="/plugins/${name}/goals.html"/>
+ <item name="Properties" href="/plugins/${name}/properties.html"/>
+ <item name="Tips" href="/plugins/${name}/tips.html"/>
+ </menu>
+ </j:file>
+ <velocity:merge
+ name="${aggregatedDir}/${name}/navigation.xml"
+ basedir="${maven.build.dir}/templates"
+ template="navigation.xml"/>
+ </j:forEach>
+ </goal>
<goal name="aggregate-components-source">
<echo message="Aggregate components by source"/>
<!-- Aggregates sources -->
<ant:mkdir dir="${maven.aggregated.src}/java"/>
<ant:mkdir dir="${maven.aggregated.src}/test"/>
- <util:tokenize var="componentList" delim="," trim="true">${maven.aggregated.components}</util:tokenize>
- <j:forEach var="component" items="${componentList}">
- <ant:copy todir="${maven.aggregated.src}/java">
- <ant:fileset dir="../${component}/src/java"/>
- </ant:copy>
- <ant:copy todir="${maven.aggregated.src}/test">
- <ant:fileset dir="../${component}/src/test"/>
- </ant:copy>
+ <util:tokenize var="componentList" delim="," trim="true">${maven.aggregated.components}</util:tokenize>
+ <j:forEach var="component" items="${componentList}">
+ <ant:copy todir="${maven.aggregated.src}/java">
+ <ant:fileset dir="../${component}/src/java"/>
+ </ant:copy>
+ <ant:copy todir="${maven.aggregated.src}/test">
+ <ant:fileset dir="../${component}/src/test"/>
+ </ant:copy>
</j:forEach>
</goal>
@@ -104,7 +104,7 @@
<ant:mkdir dir="${maven.aggregated.src}/java/org/jcontainer/loom/interfaces"/>
<ant:tstamp/>
<j:file name="${maven.aggregated.src}/java/org/jcontainer/loom/interfaces/Version.java"
- omitXmlDeclaration="true" escapeText="false" >
+ omitXmlDeclaration="true" escapeText="false">
package org.jcontainer.loom.interfaces;
interface Version
{
@@ -112,7 +112,7 @@
String VERSION = "${pom.currentVersion}";
String DATE = "${TODAY}";
}
- </j:file>
+ </j:file>
</preGoal>
</project>
Index: project.xml
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/site/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- project.xml 3 Dec 2003 07:40:20 -0000 1.33
+++ project.xml 3 Dec 2003 10:44:49 -0000 1.34
@@ -56,7 +56,8 @@
<groupId>jcomponent</groupId>
<artifactId>jcomponent-alchemist</artifactId>
<version>20031025.132828</version>
- </dependency> <dependency>
+ </dependency>
+ <dependency>
<groupId>spice</groupId>
<artifactId>spice-loggerstore</artifactId>
<version>1.0-b3</version>
@@ -149,15 +150,15 @@
<artifactId>excalibur-i18n</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-velocity</artifactId>
- <version>20030303.205659</version>
- </dependency>
- <dependency>
- <id>velocity</id>
- <version>1.3</version>
- </dependency>
+ <dependency>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-velocity</artifactId>
+ <version>20030303.205659</version>
+ </dependency>
+ <dependency>
+ <id>velocity</id>
+ <version>1.3</version>
+ </dependency>
<dependency>
<id>wrapper</id>
<version>3.0.3</version>
@@ -178,10 +179,10 @@
<unitTestSourceDirectory>${maven.aggregated.src}/test</unitTestSourceDirectory>
<unitTest>
<resource>
- <directory>${maven.aggregated.src}/test</directory>
+ <directory>${maven.aggregated.src}/test</directory>
<includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
<include>**/*.xinfo</include>
</includes>
</resource>