svn commit: r1298531 - in /commons/proper/collections/trunk: build.xml pom.xml src/assembly/ src/java/ src/main/ src/main/assembly/ src/main/java/ src/test/java/ src/test/java/org/ src/test/org/

[sebb]

Author: sebb
Date: Thu Mar  8 19:29:25 2012
New Revision: 1298531

URL: http://svn.apache.org/viewvc?rev=1298531&view=rev
Log:
MOve to standard Maven layout

Added:
    commons/proper/collections/trunk/src/main/
    commons/proper/collections/trunk/src/main/assembly/
      - copied from r1222720, commons/proper/collections/trunk/src/assembly/
    commons/proper/collections/trunk/src/main/java/
      - copied from r1222720, commons/proper/collections/trunk/src/java/
    commons/proper/collections/trunk/src/test/java/
    commons/proper/collections/trunk/src/test/java/org/
      - copied from r1222720, commons/proper/collections/trunk/src/test/org/
Removed:
    commons/proper/collections/trunk/src/assembly/
    commons/proper/collections/trunk/src/java/
    commons/proper/collections/trunk/src/test/org/
Modified:
    commons/proper/collections/trunk/build.xml
    commons/proper/collections/trunk/pom.xml

Modified: commons/proper/collections/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/build.xml?rev=1298531&r1=1298530&r2=1298531&view=diff
==============================================================================
--- commons/proper/collections/trunk/build.xml (original)
+++ commons/proper/collections/trunk/build.xml Thu Mar  8 19:29:25 2012
@@ -44,16 +44,16 @@ limitations under the License.
   <property name="component.title.full"    value="Apache Commons Collections"/>
 
   <!-- The current version number of this component -->
-  <property name="component.version"       value="3.3"/>
+  <property name="component.version"       value="4.0-SNAPSHOT"/>
 
   <!-- The base directory for component configuration files -->
   <property name="source.conf"               value="src/conf"/>
 
   <!-- The base directory for component sources -->
-  <property name="source.java"             value="src/java"/>
+  <property name="source.java"             value="src/main/java"/>
 
   <!-- The base directory for unit test sources -->
-  <property name="source.test"             value="src/test"/>
+  <property name="source.test"             value="src/test/java"/>
 
   <!-- The directories for compilation targets -->
   <property name="build.home"              value="build"/>

Modified: commons/proper/collections/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=1298531&r1=1298530&r2=1298531&view=diff
==============================================================================
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Thu Mar  8 19:29:25 2012
@@ -389,8 +389,6 @@
 
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -431,8 +429,8 @@
           <artifactId>maven-assembly-plugin</artifactId>
           <configuration>
             <descriptors>
-              <descriptor>src/assembly/bin.xml</descriptor>
-              <descriptor>src/assembly/src.xml</descriptor>
+              <descriptor>src/main/assembly/bin.xml</descriptor>
+              <descriptor>src/main/assembly/src.xml</descriptor>
             </descriptors>
             <tarLongFileMode>gnu</tarLongFileMode>
           </configuration>