Author: jmitchell
Date: Thu Apr 27 19:00:53 2006
New Revision: 397722

URL: http://svn.apache.org/viewcvs?rev=397722&view=rev
Log:
making action1 src consistent

Added:
    struts/action/trunk/taglib/src/main/resources/META-INF/tld/
      - copied from r397591, struts/action/trunk/taglib/src/tld/
Removed:
    struts/action/trunk/taglib/src/tld/
Modified:
    struts/action/trunk/taglib/pom.xml

Modified: struts/action/trunk/taglib/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/taglib/pom.xml?rev=397722&r1=397721&r2=397722&view=diff
==============================================================================
--- struts/action/trunk/taglib/pom.xml (original)
+++ struts/action/trunk/taglib/pom.xml Thu Apr 27 19:00:53 2006
@@ -44,36 +44,21 @@
    </distributionManagement>
 
    <build>
-
-      <sourceDirectory>src/java</sourceDirectory>
-      <testSourceDirectory>src/test</testSourceDirectory>
-
       <resources>
          <resource>
-            <directory>src/java</directory>
-            <includes>
-               <include>**/*.properties</include>
-            </includes>
-         </resource>
-         <resource>
-            <directory>src/tld</directory>
-            <includes>
-               <include>**/*.tld</include>
-            </includes>
-            <targetPath>META-INF/tlds</targetPath>
+            <directory>src/main/resources</directory>
          </resource>
          <resource>
-            <directory>../build</directory>
+            <directory>src/main/java</directory>
             <includes>
-               <include>LICENSE.txt</include>
-               <include>NOTICE.txt</include>
+               <include>**/*.properties</include>
             </includes>
          </resource>
       </resources>
 
       <testResources>
          <testResource>
-            <directory>src/test</directory>
+            <directory>src/test/java</directory>
             <excludes>
                <exclude>**/*.java</exclude>
             </excludes>
@@ -112,7 +97,7 @@
             <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>



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

Reply via email to