commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1196513 - in /commons/proper/daemon/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/
Date Wed, 02 Nov 2011 09:14:59 GMT
Author: sebb
Date: Wed Nov  2 09:14:58 2011
New Revision: 1196513

URL: http://svn.apache.org/viewvc?rev=1196513&view=rev
Log:
Maven standard locations

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

Modified: commons/proper/daemon/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=1196513&r1=1196512&r2=1196513&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Wed Nov  2 09:14:58 2011
@@ -71,10 +71,10 @@
   <property name="dist.home"               value="dist"/>
 
   <!-- The base directory for component sources -->
-  <property name="source.home"             value="src/java"/>
+  <property name="source.home"             value="src/main/java"/>
 
   <!-- The base directory for unit test sources -->
-  <property name="test.home"               value="src/test"/>
+  <property name="test.home"               value="src/test/java"/>
 
   <!-- The ant dir (usefull for non standard layout)  -->
   <property name="ant.lib"                 value="${ant.home}/lib"/>

Modified: commons/proper/daemon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/pom.xml?rev=1196513&r1=1196512&r2=1196513&view=diff
==============================================================================
--- commons/proper/daemon/trunk/pom.xml (original)
+++ commons/proper/daemon/trunk/pom.xml Wed Nov  2 09:14:58 2011
@@ -98,8 +98,6 @@
   </properties>
 
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
     <plugins>
 <!--
       <plugin>
@@ -119,9 +117,9 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>src/assembly/native-src.xml</descriptor>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
+            <descriptor>src/main/assembly/native-src.xml</descriptor>
+            <descriptor>src/main/assembly/bin.xml</descriptor>
+            <descriptor>src/main/assembly/src.xml</descriptor>
           </descriptors>
           <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>



Mime
View raw message