svn commit: r932029 - in /commons/proper/chain/trunk: ./ src/assembly/ src/java/ src/main/ src/main/java/ src/site/xdoc/ src/site/xdoc/images/ src/site/xdoc/style/ src/test/java/ src/test/java/org/ src/test/java/org/apache/commons/chain/config/ src/tes...

[niallp]

Author: niallp
Date: Thu Apr  8 17:53:07 2010
New Revision: 932029

URL: http://svn.apache.org/viewvc?rev=932029&view=rev
Log:
Re-organize to standard m2 layout

Added:
    commons/proper/chain/trunk/src/main/
    commons/proper/chain/trunk/src/main/java/
      - copied from r931949, commons/proper/chain/trunk/src/java/
    commons/proper/chain/trunk/src/site/xdoc/
      - copied from r931949, commons/proper/chain/trunk/xdocs/
    commons/proper/chain/trunk/src/test/java/
    commons/proper/chain/trunk/src/test/java/org/
      - copied from r931949, commons/proper/chain/trunk/src/test/org/
Removed:
    commons/proper/chain/trunk/src/java/
    commons/proper/chain/trunk/src/site/xdoc/images/
    commons/proper/chain/trunk/src/site/xdoc/style/
    commons/proper/chain/trunk/src/test/org/
    commons/proper/chain/trunk/xdocs/
Modified:
    commons/proper/chain/trunk/pom.xml
    commons/proper/chain/trunk/src/assembly/src.xml
    
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java

Modified: commons/proper/chain/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/pom.xml?rev=932029&r1=932028&r2=932029&view=diff
==============================================================================
--- commons/proper/chain/trunk/pom.xml (original)
+++ commons/proper/chain/trunk/pom.xml Thu Apr  8 17:53:07 2010
@@ -94,11 +94,9 @@
     </properties> 
   
     <build>
-        <sourceDirectory>src/java</sourceDirectory>
-        <testSourceDirectory>src/test</testSourceDirectory>
         <testResources>
             <testResource>
-                <directory>src/test</directory>
+                <directory>src/test/java</directory>
                 <includes>
                     <include>**/*.xml</include>
                 </includes>

Modified: commons/proper/chain/trunk/src/assembly/src.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/assembly/src.xml?rev=932029&r1=932028&r2=932029&view=diff
==============================================================================
--- commons/proper/chain/trunk/src/assembly/src.xml (original)
+++ commons/proper/chain/trunk/src/assembly/src.xml Thu Apr  8 17:53:07 2010
@@ -29,11 +29,8 @@
                 <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>
-                <include>maven.xml</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>project.properties</include>
-                <include>project.xml</include>
                 <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
@@ -43,8 +40,5 @@
         <fileSet>
             <directory>src</directory>
         </fileSet>
-        <fileSet>
-            <directory>xdocs</directory>
-        </fileSet>
     </fileSets>
 </assembly>

Modified: 
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java?rev=932029&r1=931949&r2=932029&view=diff
==============================================================================
--- 
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java
 (original)
+++ 
commons/proper/chain/trunk/src/test/java/org/apache/commons/chain/config/ConfigParserTestCase.java
 Thu Apr  8 17:53:07 2010
@@ -312,6 +312,7 @@ public class ConfigParserTestCase extend
             String name = (String) names.next();
             n++;
             assertNotNull(name + " exists", catalog.getCommand(name));
+            System.out.println("NIALL: " + name);
         }
         assertEquals("Correct command count", expected, n);
     }