sraeburn 2003/12/02 18:05:09
Modified: . project.properties maven.xml project.xml
Log:
Maven build changes to create TLDs & copy resources for struts.jar
PR: 25076 & 25147
Submitted by: Tim Chen & Joe Germuska
Revision Changes Path
1.4 +5 -1 jakarta-struts/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-struts/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 29 Nov 2003 07:27:33 -0000 1.3
+++ project.properties 3 Dec 2003 02:05:09 -0000 1.4
@@ -21,6 +21,10 @@
#keep ant & maven directories seperate.
maven.build.dir=m-target
+# doc.dir is a property used in the original Ant-oriented build.xml.
+# define it here to make it easier to port ant tasks to maven.xml
+doc.dir=doc
+
# display the date on the site
maven.xdoc.date = left
# Display the version the web site is documenting
1.4 +70 -5 jakarta-struts/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/maven.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- maven.xml 29 Nov 2003 07:27:33 -0000 1.3
+++ maven.xml 3 Dec 2003 02:05:09 -0000 1.4
@@ -1,15 +1,80 @@
-<project default="jar:jar">
+<project default="jar:jar"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant">
<preGoal name="xdoc:jelly-transform">
<attainGoal name="html2xdoc"/>
- </preGoal>
- <!--
+ <!--
Maven FAQ PlugIn 1.2 will allow multiple faqs
For now, we'll just generate them from xdocs
- <preGoal name="xdoc:jelly-transform">
<attainGoal name="faq"/>
+ -->
</preGoal>
- -->
+
+ <!-- Prepare additional Jar resources -->
+ <postGoal name="java:jar-resources">
+
+ <!-- Generate TLDs -->
+
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
+ <ant:style basedir="doc/userGuide"
+ destdir="${maven.build.dir}/classes/META-INF/tlds"
+ extension=".tld"
+ style="doc/stylesheets/tld.xsl"
+ includes="struts-*.xml"/>
+
+ <!-- Copy DTDs -->
+ <ant:copy todir="${maven.build.dir}/classes/org/apache/struts/resources">
+ <ant:fileset dir="./conf/share">
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <!-- Copy Instructions and Readmes -->
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README*"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="STATUS*"/>
+ <ant:include name="INSTALL*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy configuration files -->
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
+ <ant:fileset dir="./conf/share">
+ <ant:include name="*.xml"/>
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+
+ <postGoal name="dist:prepare-src-filesystem">
+ <!-- Copy Instructions and Readmes -->
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir=".">
+ <ant:include name="README*"/>
+ <ant:include name="LICENSE*"/>
+ <ant:include name="STATUS*"/>
+ <ant:include name="INSTALL*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <!-- Copy configuration files -->
+ <j:set var="docsDest" value="${maven.docs.dest}"/>
+ <ant:copy todir="${maven.dist.src.assembly.dir}/conf">
+ <ant:fileset dir="./conf/share">
+ <ant:include name="*.xml"/>
+ <ant:include name="*.dtd"/>
+ </ant:fileset>
+ </ant:copy>
+ </postGoal>
+
+
</project>
1.15 +9 -0 jakarta-struts/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 29 Nov 2003 07:27:33 -0000 1.14
+++ project.xml 3 Dec 2003 02:05:09 -0000 1.15
@@ -285,6 +285,15 @@
<version>1.4.1</version>
<url>http://jakarta.apache.org/cactus</url>
</dependency>
+
+ <!-- for tld generation -->
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.5.1</version>
+ <url>http://xml.apache.org/xalan</url>
+ </dependency>
+
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
