You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/05/04 01:03:33 UTC

svn commit: r399485 - in /struts/sandbox/trunk/tiles: ./ core/ core/src/ core/src/main/ core/src/main/java/ core/src/main/resources/ core/src/main/resources/META-INF/ core/src/main/resources/org/ core/src/main/resources/org/apache/ core/src/main/resour...

Author: wsmoak
Date: Wed May  3 16:03:30 2006
New Revision: 399485

URL: http://svn.apache.org/viewcvs?rev=399485&view=rev
Log:
Maven 2 reorganization
Issue: SB-19

Added:
    struts/sandbox/trunk/tiles/core/
    struts/sandbox/trunk/tiles/core/LICENSE.txt
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/LICENSE.txt
    struts/sandbox/trunk/tiles/core/NOTICE.txt
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/NOTICE.txt
    struts/sandbox/trunk/tiles/core/pom.xml
      - copied, changed from r399479, struts/sandbox/trunk/tiles/pom.xml
    struts/sandbox/trunk/tiles/core/src/
    struts/sandbox/trunk/tiles/core/src/main/
    struts/sandbox/trunk/tiles/core/src/main/java/
      - copied from r399479, struts/sandbox/trunk/tiles/src/java/
    struts/sandbox/trunk/tiles/core/src/main/resources/
    struts/sandbox/trunk/tiles/core/src/main/resources/META-INF/
    struts/sandbox/trunk/tiles/core/src/main/resources/META-INF/tiles-core.tld
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/src/conf/tiles-core.tld
    struts/sandbox/trunk/tiles/core/src/main/resources/org/
    struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/
    struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/
    struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/
    struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/tiles-config_1_1.dtd
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/src/conf/tiles-config_1_1.dtd
    struts/sandbox/trunk/tiles/core/src/main/resources/org/apache/tiles/resources/tiles-config_1_2.dtd
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/src/conf/tiles-config_1_2.dtd
    struts/sandbox/trunk/tiles/core/src/test/
    struts/sandbox/trunk/tiles/core/src/test/java/
    struts/sandbox/trunk/tiles/core/src/test/java/org/
      - copied from r399479, struts/sandbox/trunk/tiles/src/test/org/
    struts/sandbox/trunk/tiles/src/site/
    struts/sandbox/trunk/tiles/src/site/site.xml
      - copied unchanged from r399479, struts/sandbox/trunk/tiles/xdocs/navigation.xml
Removed:
    struts/sandbox/trunk/tiles/LICENSE.txt
    struts/sandbox/trunk/tiles/NOTICE.txt
    struts/sandbox/trunk/tiles/build.properties.sample
    struts/sandbox/trunk/tiles/build.xml
    struts/sandbox/trunk/tiles/pom.xml
    struts/sandbox/trunk/tiles/project.properties
    struts/sandbox/trunk/tiles/project.xml
    struts/sandbox/trunk/tiles/src/conf/
    struts/sandbox/trunk/tiles/src/java/
    struts/sandbox/trunk/tiles/src/test/
    struts/sandbox/trunk/tiles/xdocs/

Copied: struts/sandbox/trunk/tiles/core/pom.xml (from r399479, struts/sandbox/trunk/tiles/pom.xml)
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/tiles/core/pom.xml?p2=struts/sandbox/trunk/tiles/core/pom.xml&p1=struts/sandbox/trunk/tiles/pom.xml&r1=399479&r2=399485&rev=399485&view=diff
==============================================================================
--- struts/sandbox/trunk/tiles/pom.xml (original)
+++ struts/sandbox/trunk/tiles/core/pom.xml Wed May  3 16:03:30 2006
@@ -37,23 +37,9 @@
 
    <build>
 
-      <sourceDirectory>src/java</sourceDirectory>
-      <testSourceDirectory>src/test</testSourceDirectory>
-
       <resources>
          <resource>
-            <directory>src/conf</directory>
-            <includes>
-               <include>**/*.dtd</include>
-            </includes>
-            <targetPath>org/apache/tiles/resources</targetPath>
-         </resource>
-         <resource>
-            <directory>src/conf</directory>
-            <includes>
-               <include>**/*.tld</include>
-            </includes>
-            <targetPath>META-INF</targetPath>
+            <directory>src/main/resources</directory>
          </resource>
          <resource>
             <directory>.</directory>
@@ -67,14 +53,7 @@
 
       <testResources>
          <testResource>
-            <directory>src/conf</directory>
-            <targetPath>org/apache/tiles/resources</targetPath>
-            <includes>
-               <include>**/*.dtd</include>
-            </includes>
-         </testResource>
-         <testResource>
-            <directory>src/test</directory>
+            <directory>src/test/java</directory>
             <includes>
                <include>**/*.xml</include>
                <include>**/*.properties</include>