Author: wsmoak
Date: Wed May  3 22:41:13 2006
New Revision: 399554

URL: http://svn.apache.org/viewcvs?rev=399554&view=rev
Log:
Move the faces-config.xml file into META-INF.
Include src/main/resources in the jar in addition to the .properties files.
Configure maven-taglib-plugin for website reports.
Remove old xml and xsl files.

Added:
    struts/action/trunk/faces/src/main/resources/META-INF/faces-config.xml
      - copied unchanged from r399452, 
struts/action/trunk/faces/src/main/resources/faces-config.xml
Removed:
    struts/action/trunk/faces/src/main/resources/MANIFEST.MF
    struts/action/trunk/faces/src/main/resources/faces-config.xml
    struts/action/trunk/faces/src/main/resources/struts-doc.xsl
    struts/action/trunk/faces/src/main/resources/struts-faces.xml
    struts/action/trunk/faces/src/main/resources/struts-tld.xsl
Modified:
    struts/action/trunk/faces/pom.xml

Modified: struts/action/trunk/faces/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=399554&r1=399553&r2=399554&view=diff
==============================================================================
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Wed May  3 22:41:13 2006
@@ -46,6 +46,9 @@
    <build>
       <resources>
          <resource>
+            <directory>src/main/resources</directory>
+         </resource>
+         <resource>
             <directory>src/main/java</directory>
             <includes>
                <include>**/*.properties</include>
@@ -99,19 +102,18 @@
 
    </dependencies>
 
-   <!-- 
    <reporting>
       <plugins>
          <plugin>
             <groupId>net.sourceforge.maven-taglib</groupId>
             <artifactId>maven-taglib-plugin</artifactId>
             <configuration>
-               <taglib.src.dir>${basedir}/src/tld</taglib.src.dir>
+               
<taglib.src.dir>${basedir}/src/main/resources/META-INF/tld</taglib.src.dir>
             </configuration>
          </plugin>
       </plugins>
    </reporting>
-   -->
+
      <profiles>
        <profile>
         <id>pre-assembly</id>


Reply via email to