Author: wsmoak
Date: Sun Sep 25 09:59:25 2005
New Revision: 291448

URL: http://svn.apache.org/viewcvs?rev=291448&view=rev
Log:
Updated build to include the new TLD files.
Removed TLD generation goal.
Added Taglib Reference to website navigation.

Modified:
    struts/el/trunk/maven.xml
    struts/el/trunk/project.xml
    struts/el/trunk/xdocs/navigation.xml

Modified: struts/el/trunk/maven.xml
URL: 
http://svn.apache.org/viewcvs/struts/el/trunk/maven.xml?rev=291448&r1=291447&r2=291448&view=diff
==============================================================================
--- struts/el/trunk/maven.xml (original)
+++ struts/el/trunk/maven.xml Sun Sep 25 09:59:25 2005
@@ -3,17 +3,6 @@
   xmlns:ant="jelly:ant"
   xmlns:maven="jelly:maven">
 
-  <!-- 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"/>
-  </postGoal>
-
   <!--
    Build the .war file.
   -->

Modified: struts/el/trunk/project.xml
URL: 
http://svn.apache.org/viewcvs/struts/el/trunk/project.xml?rev=291448&r1=291447&r2=291448&view=diff
==============================================================================
--- struts/el/trunk/project.xml (original)
+++ struts/el/trunk/project.xml Sun Sep 25 09:59:25 2005
@@ -150,6 +150,14 @@
       <url>http://xml.apache.org/xalan-j</url>
     </dependency>
     
+    <dependency>
+      <groupId>maven-taglib</groupId>
+      <artifactId>maven-taglib-plugin</artifactId>
+      <version>1.4</version>
+      <type>plugin</type>
+      <url>http://maven-taglib.sourceforge.net</url>
+    </dependency>
+    
   </dependencies>
   
   <build>
@@ -166,7 +174,15 @@
     </unitTest>
     <!-- J A R  R E S O U R C E S -->
     <!-- Resources that are packaged up inside the JAR file -->
-    <resources />
+    <resources>
+      <resource>
+        <directory>src/tld</directory>
+        <includes>
+          <include>**/*.tld</include>
+        </includes>
+        <targetPath>META-INF/tlds</targetPath>
+      </resource>
+    </resources>
     <!-- Integration unit test cases -->
     <integrationUnitTest>
       <includes>
@@ -181,6 +197,23 @@
   
   <reports>
     <!-- put el specific reports here -->
-    
+    <!--report>maven-cactus-plugin</report-->
+    <report>taglib</report>
+    <report>maven-checkstyle-plugin</report> 
+    <report>maven-changelog-plugin</report>
+    <report>maven-changes-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-faq-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-jdepend-plugin</report>
+    <report>maven-junit-report-plugin</report>
+    <report>maven-jxr-plugin</report> -->
+    <!--report>maven-linkcheck-plugin</report-->
+    <report>maven-pmd-plugin</report>
+    <report>maven-simian-plugin</report>
+    <report>maven-tasklist-plugin</report>
+    <report>maven-jcoverage-plugin</report>
+    <!--report>maven-findbugs-plugin</report-->
   </reports>
 </project>

Modified: struts/el/trunk/xdocs/navigation.xml
URL: 
http://svn.apache.org/viewcvs/struts/el/trunk/xdocs/navigation.xml?rev=291448&r1=291447&r2=291448&view=diff
==============================================================================
--- struts/el/trunk/xdocs/navigation.xml (original)
+++ struts/el/trunk/xdocs/navigation.xml Sun Sep 25 09:59:25 2005
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="Struts EL">
     <body>
+        <menu name="Taglib Reference">
+            <item name="Bean EL" href="tagreference-struts-bean-el.html"/>    
+            <item name="HTML EL" href="tagreference-struts-html-el.html"/>
+            <item name="Logic EL" href="tagreference-struts-logic-el.html"/>
+            <item name="Tiles EL" href="tagreference-struts-tiles-el.html"/>
+        </menu>
         <menu name="Quick Links">
             <item
                     name="Struts"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to