brett 2004/04/01 19:48:57
Modified: castor/xdocs tags.xml
changelog plugin.properties project.xml
cruisecontrol plugin.properties
cruisecontrol/xdocs properties.xml
developer-activity plugin.properties
ear/xdocs properties.xml
ejb/xdocs properties.xml
faq plugin.properties
file-activity plugin.properties
genapp/src/plugin-resources/struts/template-resources
project.properties
html2xdoc project.properties
javadoc plugin.properties
jellydoc project.properties
linkcheck plugin.properties
Removed: ashkelon plugin.properties
Log:
don't override defaults
Revision Changes Path
1.3 +86 -86 maven-plugins/castor/xdocs/tags.xml
Index: tags.xml
===================================================================
RCS file: /home/cvs/maven-plugins/castor/xdocs/tags.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tags.xml 4 Mar 2004 18:01:05 -0000 1.2
+++ tags.xml 2 Apr 2004 03:48:56 -0000 1.3
@@ -16,89 +16,89 @@
* limitations under the License.
*/
-->
-
-<document>
-
- <properties>
- <title>Maven Castor Plug-in Tags</title>
- <author email="[EMAIL PROTECTED]">Tim Anderson</author>
- </properties>
-
- <body>
- <section name="Overview">
- <p>
- This document describes the
- <a href="http://jakarta.apache.org/commons/jelly/tags.html";>tags</a>
- that are available when using the Castor Plug-in with Maven.
- </p>
- <p>
- Please refer to the
- <a href="../../start/integrate.html">Integration</a> document for
- more information on how to integrate these tags into
- your project.
- </p>
- </section>
-
- <section name="Tags">
- <table>
- <tr><th>Goal</th><th>Description</th></tr>
- <tr>
- <td><a href="#castor:generate">castor:generate</a></td>
- <td>Generate java sources from an XML Schema.</td>
- </tr>
- <tr>
- <td>castor:srcgen</td>
- <td><strong>DEPRECATED</strong>. Use castor:generate instead</td>
- </tr>
- </table>
-
- <subsection name="castor:generate">
- <p>
- The <code>castor:generate</code> target generates java sources
- from an XML Schema (<code>XSD</code> file). <br/>
- Sources are generated in the
- <a href="properties.html">${maven.castor.dest}</a> directory.<br/>
- Sources are only generated if the input schema is newer than any
- existing generated source.
- </p>
- <table>
- <tr>
- <th>Attribute Name</th><th>Description</th><th>Optional?</th>
- </tr>
- <tr>
- <td>schema</td>
- <td>The path to the XML schema</td>
- <td>No</td>
- </tr>
- <tr>
- <td>package</td>
- <td>The package for the generated source</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>types</td>
- <td>Sets which type factory to use. This is useful if you want
- JDK 1.2 collections instead of JDK 1.1, or if you want to pass
- in your own FieldInfoFactory.<br/>
- If not specified, java.util.Vector will be used for
- collections.<br/>
- See
- <a
href="http://castor.exolab.org/sourcegen.html#Collection-Types";>Collection Types</a>
- for valid values.
- </td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>marshal</td>
- <td>
- If 'false', disables generation of the marshalling framework
- methods (marshal, unmarshal, validate).<br/>
- Defaults to 'true'.
- </td>
- <td>Yes</td>
- </tr>
- </table>
- </subsection>
- </section>
- </body>
-</document>
\ No newline at end of file
+
+<document>
+
+ <properties>
+ <title>Maven Castor Plug-in Tags</title>
+ <author email="[EMAIL PROTECTED]">Tim Anderson</author>
+ </properties>
+
+ <body>
+ <section name="Overview">
+ <p>
+ This document describes the
+ <a href="http://jakarta.apache.org/commons/jelly/tags.html";>tags</a>
+ that are available when using the Castor Plug-in with Maven.
+ </p>
+ <p>
+ Please refer to the
+ <a href="../../start/integrate.html">Integration</a> document for
+ more information on how to integrate these tags into
+ your project.
+ </p>
+ </section>
+
+ <section name="Tags">
+ <table>
+ <tr><th>Goal</th><th>Description</th></tr>
+ <tr>
+ <td><a href="#castor:generate">castor:generate</a></td>
+ <td>Generate java sources from an XML Schema.</td>
+ </tr>
+ <tr>
+ <td>castor:srcgen</td>
+ <td><strong>DEPRECATED</strong>. Use castor:generate instead</td>
+ </tr>
+ </table>
+
+ <subsection name="castor:generate">
+ <p>
+ The <code>castor:generate</code> target generates java sources
+ from an XML Schema (<code>XSD</code> file). <br/>
+ Sources are generated in the
+ <a href="properties.html">${maven.castor.dest}</a> directory.<br/>
+ Sources are only generated if the input schema is newer than any
+ existing generated source.
+ </p>
+ <table>
+ <tr>
+ <th>Attribute Name</th><th>Description</th><th>Optional?</th>
+ </tr>
+ <tr>
+ <td>schema</td>
+ <td>The path to the XML schema</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>package</td>
+ <td>The package for the generated source</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>types</td>
+ <td>Sets which type factory to use. This is useful if you want
+ JDK 1.2 collections instead of JDK 1.1, or if you want to pass
+ in your own FieldInfoFactory.<br/>
+ If not specified, java.util.Vector will be used for
+ collections.<br/>
+ See
+ <a
href="http://castor.exolab.org/sourcegen.html#Collection-Types";>Collection Types</a>
+ for valid values.
+ </td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>marshal</td>
+ <td>
+ If 'false', disables generation of the marshalling framework
+ methods (marshal, unmarshal, validate).<br/>
+ Defaults to 'true'.
+ </td>
+ <td>Yes</td>
+ </tr>
+ </table>
+ </subsection>
+ </section>
+ </body>
+</document>
1.4 +0 -4 maven-plugins/changelog/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2004 18:01:12 -0000 1.3
+++ plugin.properties 2 Apr 2004 03:48:56 -0000 1.4
@@ -20,11 +20,7 @@
# CVS change log plugin.
# -------------------------------------------------------------------
-# These three don't belong here.
maven.changelog.basedir=${basedir}
-maven.build.dir = ${basedir}/target
-maven.gen.docs = ${maven.build.dir}/generated-xdocs
-maven.docs.outputencoding = ISO-8859-1
maven.changelog.range = 30
maven.changelog.factory = org.apache.maven.cvslib.CvsChangeLogFactory
1.34 +1 -1 maven-plugins/changelog/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 10 Mar 2004 13:18:51 -0000 1.33
+++ project.xml 2 Apr 2004 03:48:56 -0000 1.34
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-changelog-plugin</id>
<name>Maven Changelog Plug-in</name>
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.5-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce SCM changelog reports</shortDescription>
<url>http://maven.apache.org/reference/plugins/changelog/</url>
1.4 +1 -1 maven-plugins/cruisecontrol/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2004 18:02:46 -0000 1.3
+++ plugin.properties 2 Apr 2004 03:48:56 -0000 1.4
@@ -17,7 +17,7 @@
maven.cruisecontrol.config=${basedir}/cruisecontrol.xml
maven.cruisecontrol.schedule.interval=300
maven.cruisecontrol.checkout.dir=${basedir}/checkout
-maven.cruisecontrol.logs.dir=${basedir}/target/cc-logs
+maven.cruisecontrol.logs.dir=${maven.build.dir}/cc-logs
maven.cruisecontrol.goals=scm:update-project|clean test|site:deploy
maven.cruisecontrol.home=CC_HOME_NOT_SET
maven.cruisecontrol.mail.host=localhost
1.4 +1 -1 maven-plugins/cruisecontrol/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/properties.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- properties.xml 4 Mar 2004 18:02:46 -0000 1.3
+++ properties.xml 2 Apr 2004 03:48:56 -0000 1.4
@@ -74,7 +74,7 @@
<td>Yes</td>
<td>
<p>Default value is
- <code>${basedir}/target/cc-logs</code>.</p>
+ <code>${maven.build.dir}/cc-logs</code>.</p>
</td>
</tr>
<tr>
1.5 +0 -4 maven-plugins/developer-activity/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/developer-activity/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 4 Mar 2004 18:03:53 -0000 1.4
+++ plugin.properties 2 Apr 2004 03:48:56 -0000 1.5
@@ -22,8 +22,4 @@
maven.changelog.basedir=${basedir}
-maven.build.dir = ${basedir}/target
-
-maven.docs.outputencoding = ISO-8859-1
-
maven.activitylog.range = 30
1.12 +2 -2 maven-plugins/ear/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ear/xdocs/properties.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- properties.xml 15 Mar 2004 11:08:55 -0000 1.11
+++ properties.xml 2 Apr 2004 03:48:56 -0000 1.12
@@ -110,14 +110,14 @@
<td>maven.build.dir</td>
<td>where the component will be assembled</td>
<td>
- <A href="../../../java/target/docs/properties.html#Other
Settings">maven.build.dir</A>
+ <A href="../java/properties.html#Other Settings">maven.build.dir</A>
</td>
</tr>
<tr>
<td>maven.final.name</td>
<td>The assembled component will be
<code>${maven.build.dir}/${maven.final.name}.ear</code></td>
<td>
- <A href="../../../java/target/docs/properties.html#Other
Settings">maven.final.name</A>
+ <A href="../java/properties.html#Other Settings">maven.final.name</A>
</td>
</tr>
</table>
1.9 +2 -2 maven-plugins/ejb/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/ejb/xdocs/properties.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- properties.xml 16 Mar 2004 23:43:17 -0000 1.8
+++ properties.xml 2 Apr 2004 03:48:56 -0000 1.9
@@ -121,14 +121,14 @@
<td>maven.build.dir</td>
<td>where the component will be assembled</td>
<td>
- <A href="../../../java/target/docs/properties.html#Other
Settings">maven.build.dir</A>
+ <A href="../java/properties.html#Other Settings">maven.build.dir</A>
</td>
</tr>
<tr>
<td>maven.final.name</td>
<td>The assembled component will be
<code>${maven.build.dir}/${maven.final.name}.jar</code></td>
<td>
- <A href="../../../java/target/docs/properties.html#Other
Settings">maven.final.name</A>
+ <A href="../java/properties.html#Other Settings">maven.final.name</A>
</td>
</tr>
</table>
1.4 +1 -1 maven-plugins/faq/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/faq/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2004 18:05:31 -0000 1.3
+++ plugin.properties 2 Apr 2004 03:48:57 -0000 1.4
@@ -18,4 +18,4 @@
maven.faq.src=${maven.docs.src}
# Destination directory where output xdocs file are produced
-maven.faq.dest=${maven.build.dir}/generated-xdocs
+maven.faq.dest=${maven.gen.docs}
1.5 +0 -4 maven-plugins/file-activity/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/file-activity/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 4 Mar 2004 18:13:19 -0000 1.4
+++ plugin.properties 2 Apr 2004 03:48:57 -0000 1.5
@@ -22,8 +22,4 @@
maven.changelog.basedir=${basedir}
-maven.build.dir = ${basedir}/target
-
-maven.docs.outputencoding = ISO-8859-1
-
maven.activitylog.range = 30
1.3 +0 -1
maven-plugins/genapp/src/plugin-resources/struts/template-resources/project.properties
Index: project.properties
===================================================================
RCS file:
/home/cvs/maven-plugins/genapp/src/plugin-resources/struts/template-resources/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 4 Mar 2004 18:13:35 -0000 1.2
+++ project.properties 2 Apr 2004 03:48:57 -0000 1.3
@@ -24,7 +24,6 @@
maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-#maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=target
maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
maven.xdoclet.webdoclet.strutsvalidationxml.0=true
maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
1.6 +0 -1 maven-plugins/html2xdoc/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/html2xdoc/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 4 Mar 2004 18:13:56 -0000 1.5
+++ project.properties 2 Apr 2004 03:48:57 -0000 1.6
@@ -22,4 +22,3 @@
maven.license.licenseFile=${basedir}/../LICENSE.txt
maven.checkstyle.header.file=${basedir}/../LICENSE.txt
maven.checkstyle.format = turbine
-maven.docs.outputencoding = ISO-8859-1
1.11 +1 -3 maven-plugins/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/javadoc/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 4 Mar 2004 18:35:58 -0000 1.10
+++ plugin.properties 2 Apr 2004 03:48:57 -0000 1.11
@@ -38,7 +38,5 @@
maven.javadoc.useexternalfile = yes
maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API
-maven.docs.outputencoding = ISO-8859-1
-
#specify an alternate locale
-#maven.javadoc.locale=en_US
\ No newline at end of file
+#maven.javadoc.locale=en_US
1.7 +0 -1 maven-plugins/jellydoc/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/maven-plugins/jellydoc/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 4 Mar 2004 18:36:13 -0000 1.6
+++ project.properties 2 Apr 2004 03:48:57 -0000 1.7
@@ -14,7 +14,6 @@
# limitations under the License.
# -------------------------------------------------------------------
-maven.docs.outputencoding = ISO-8859-1
maven.activitylog.range = 30
maven.xdoc.date=left
## maven.xdoc.version=${pom.currentVersion}
1.4 +0 -4 maven-plugins/linkcheck/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/linkcheck/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2004 18:36:32 -0000 1.3
+++ plugin.properties 2 Apr 2004 03:48:57 -0000 1.4
@@ -20,8 +20,4 @@
# LinkCheck report plugin.
# -------------------------------------------------------------------
-maven.build.dir = ${basedir}/target
-maven.docs.dest = ${maven.build.dir}/docs
-maven.docs.outputencoding = ISO-8859-1
-
maven.linkcheck.cache=${maven.build.dir}/linkcheck/linkcheck.cache
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
