svn commit: r394264 - in /struts/action/trunk/core: ./ conf/ src/java/ src/main/ src/main/java/ src/main/resources/ src/main/resources/org/ src/main/resources/org/apache/ src/main/resources/org/apache/struts/ src/main/resources/org/apache/struts/chain/...

[wsmoak]

Author: wsmoak
Date: Fri Apr 14 23:10:44 2006
New Revision: 394264

URL: http://svn.apache.org/viewcvs?rev=394264&view=rev
Log:
Reorganize Struts Action Core for Maven 2.

Added:
    struts/action/trunk/core/src/main/
    struts/action/trunk/core/src/main/java/
      - copied from r394255, struts/action/trunk/core/src/java/
    struts/action/trunk/core/src/main/resources/
    struts/action/trunk/core/src/main/resources/org/
    struts/action/trunk/core/src/main/resources/org/apache/
    struts/action/trunk/core/src/main/resources/org/apache/struts/
    struts/action/trunk/core/src/main/resources/org/apache/struts/chain/
    
struts/action/trunk/core/src/main/resources/org/apache/struts/chain/chain-config.xml
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/chain-config.xml
    struts/action/trunk/core/src/main/resources/org/apache/struts/resources/
    
struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/struts-config_1_0.dtd
    
struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/struts-config_1_1.dtd
    
struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/struts-config_1_2.dtd
    
struts/action/trunk/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/struts-config_1_3.dtd
    
struts/action/trunk/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/web-app_2_3.dtd
    struts/action/trunk/core/src/main/resources/org/apache/struts/validator/
    
struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml
      - copied unchanged from r394255, 
struts/action/trunk/core/conf/java/validator-rules.xml
    struts/action/trunk/core/src/test/java/
    struts/action/trunk/core/src/test/java/org/
      - copied from r394255, struts/action/trunk/core/src/test/org/
Removed:
    struts/action/trunk/core/conf/
    struts/action/trunk/core/src/java/
    struts/action/trunk/core/src/test/org/
Modified:
    struts/action/trunk/core/pom.xml

Modified: struts/action/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewcvs/struts/action/trunk/core/pom.xml?rev=394264&r1=394263&r2=394264&view=diff
==============================================================================
--- struts/action/trunk/core/pom.xml (original)
+++ struts/action/trunk/core/pom.xml Fri Apr 14 23:10:44 2006
@@ -58,35 +58,14 @@
 
     <build>
 
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
-
         <resources>
             <resource>
-                <directory>src/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>conf/java</directory>
-                <targetPath>org/apache/struts/resources</targetPath>
-                <includes>
-                    <include>**/*.dtd</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>conf/java</directory>
-                <targetPath>org/apache/struts/chain</targetPath>
-                <includes>
-                    <include>chain-config.xml</include>
-                </includes>
+                <directory>src/main/resources</directory>
             </resource>
             <resource>
-                <directory>conf/java</directory>
-                <targetPath>org/apache/struts/validator</targetPath>
+                <directory>src/main/java</directory>
                 <includes>
-                    <include>validator-rules.xml</include>
+                    <include>**/*.properties</include>
                 </includes>
             </resource>
             <resource>
@@ -100,15 +79,7 @@
 
         <testResources>
             <testResource>
-                <targetPath>org/apache/struts/resources</targetPath>
-                <directory>conf/java</directory>
-                <includes>
-                    <include>**/*.xml</include>
-                    <include>**/*.dtd</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>src/test</directory>
+                <directory>src/test/java</directory>
                 <includes>
                     <include>**/*.xml</include>
                 </includes>



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