Author: jmitchell
Date: Tue Mar 15 20:18:18 2005
New Revision: 157656
URL: http://svn.apache.org/viewcvs?view=rev&rev=157656
Log:
fix cactus config (see README.txt to get cactus to run)
Modified:
struts/taglib/trunk/maven.xml
Modified: struts/taglib/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/maven.xml?view=diff&r1=157655&r2=157656
==============================================================================
--- struts/taglib/trunk/maven.xml (original)
+++ struts/taglib/trunk/maven.xml Tue Mar 15 20:18:18 2005
@@ -12,6 +12,11 @@
<!-- Prepare additional Jar resources -->
<postGoal name="java:jar-resources">
+ <attainGoal name="struts:generate-tlds"/>
+ </postGoal>
+
+
+ <goal name="struts:generate-tlds">
<!-- Generate TLDs -->
${systemScope.setProperty('javax.xml.transform.TransformerFactory','org.apache.xalan.processor.TransformerFactoryImpl')}
@@ -20,33 +25,14 @@
extension=".tld"
style="doc/stylesheets/tld.xsl"
includes="struts-*.xml"/>
- </postGoal>
-
-
- <!--
- Prepare Cactus webapp with necessary config files.
- -->
- <postGoal name="war:webapp">
- <j:set
- var="webapp.root"
-
- value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}" />
- <ant:echo>Copying files to ${webapp.root}</ant:echo>
- <ant:filter token="cactus.contextURL" value="${cactus.contextURL}"/>
- <ant:copy todir="${webapp.root}/WEB-INF/classes" filtering="on">
- <ant:fileset dir="conf/test" includes="*.properties"/>
- </ant:copy>
- <ant:copy todir="${webapp.root}" filtering="off">
- <ant:fileset dir="web/test" includes="**/*.jsp"/>
- <ant:fileset dir="web/test" includes="**/*.txt"/>
- </ant:copy>
- <ant:copy todir="${webapp.root}/WEB-INF" filtering="off">
- <ant:fileset dir="${maven.build.dir}/classes/META-INF/tlds" includes="*.tld"/>
- </ant:copy>
- <ant:copy file="conf/test/struts-config.xml" todir="${webapp.root}/WEB-INF" />
- <ant:copy file="conf/test/maven-web.xml" tofile="${webapp.root}/WEB-INF/web.xml" />
- </postGoal>
+
+ </goal>
+ <preGoal name="java:compile">
+ <mkdir dir="${maven.build.dir}/xdoclet/webdoclet/WEB-INF" />
+ <attainGoal name="xdoclet:webdoclet" />
+ </preGoal>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org