commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r493957 - in /jakarta/commons/proper/validator/trunk: LICENSE.txt NOTICE.txt build.xml maven.xml pom.xml project.xml src/main/assembly/bin.xml src/main/assembly/src.xml src/main/resources/LICENSE.txt src/main/resources/NOTICE.txt
Date Mon, 08 Jan 2007 05:36:13 GMT
Author: niallp
Date: Sun Jan  7 21:36:12 2007
New Revision: 493957

URL: http://svn.apache.org/viewvc?view=rev&rev=493957
Log:
Move LICENSE.txt and NOTICE.txt back to the root directory

Added:
    jakarta/commons/proper/validator/trunk/LICENSE.txt
      - copied unchanged from r493950, jakarta/commons/proper/validator/trunk/src/main/resources/LICENSE.txt
    jakarta/commons/proper/validator/trunk/NOTICE.txt
      - copied unchanged from r493950, jakarta/commons/proper/validator/trunk/src/main/resources/NOTICE.txt
Removed:
    jakarta/commons/proper/validator/trunk/src/main/resources/LICENSE.txt
    jakarta/commons/proper/validator/trunk/src/main/resources/NOTICE.txt
Modified:
    jakarta/commons/proper/validator/trunk/build.xml
    jakarta/commons/proper/validator/trunk/maven.xml
    jakarta/commons/proper/validator/trunk/pom.xml
    jakarta/commons/proper/validator/trunk/project.xml
    jakarta/commons/proper/validator/trunk/src/main/assembly/bin.xml
    jakarta/commons/proper/validator/trunk/src/main/assembly/src.xml

Modified: jakarta/commons/proper/validator/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/build.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/build.xml (original)
+++ jakarta/commons/proper/validator/trunk/build.xml Sun Jan  7 21:36:12 2007
@@ -315,16 +315,16 @@
         <property name="final.name" value="commons-${component.name}-${component.version}"/>
     </ant>
 
-    <copy      file="${resources.home}/LICENSE.txt"
+    <copy      file="LICENSE.txt"
               todir="${dist.home}"/>
-    <copy      file="${resources.home}/NOTICE.txt"
+    <copy      file="NOTICE.txt"
               todir="${dist.home}"/>
     <copy      file="RELEASE-NOTES.txt"
               todir="${dist.home}"/>
     <mkdir      dir="${build.home}/classes/META-INF"/>
-    <copy      file="${resources.home}/LICENSE.txt"
+    <copy      file="LICENSE.txt"
              tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-    <copy      file="${resources.home}/NOTICE.txt"
+    <copy      file="NOTICE.txt"
              tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
 
     <manifest file="${build.home}/MANIFEST.MF">

Modified: jakarta/commons/proper/validator/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/maven.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/maven.xml (original)
+++ jakarta/commons/proper/validator/trunk/maven.xml Sun Jan  7 21:36:12 2007
@@ -24,13 +24,6 @@
     <attainGoal name="html2xdoc"/>
   </preGoal>
 
-  <preGoal name="site">
-    <!-- keep site generation & checkstyle happy -->
-    <copy todir="${basedir}">
-      <fileset file="${basedir}/src/main/resources/LICENSE.txt"/>
-    </copy>
-  </preGoal>
-
   <postGoal name="java:compile">
 
     <copy todir="${maven.build.dir}/classes/">
@@ -62,8 +55,7 @@
 
     <!-- Copy the NOTICE -->
     <copy todir="${maven.dist.bin.assembly.dir}">
-      <fileset file="${basedir}/src/main/resources/LICENSE.txt"/>
-      <fileset file="${basedir}/src/main/resources/NOTICE.txt"/>
+      <fileset file="${basedir}/NOTICE.txt"/>
       <fileset file="${basedir}/RELEASE-NOTES.txt"/>
       <fileset file="${maven.build.dir}/*.js"/>
     </copy>
@@ -77,8 +69,7 @@
 
     <!-- Copy the NOTICE -->
     <copy todir="${maven.dist.src.assembly.dir}">
-      <fileset file="${basedir}/src/main/resources/LICENSE.txt"/>
-      <fileset file='${basedir}/src/main/resources/NOTICE.txt'/>
+      <fileset file="${basedir}/NOTICE.txt"/>
       <fileset file="${basedir}/RELEASE-NOTES.txt"/>
       <fileset file="${basedir}/build.properties.sample"/>
     </copy>

Modified: jakarta/commons/proper/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/pom.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/pom.xml (original)
+++ jakarta/commons/proper/validator/trunk/pom.xml Sun Jan  7 21:36:12 2007
@@ -112,6 +112,14 @@
     <build>
         <resources>
             <resource>
+                <directory>${basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
                 <directory>src/main/resources</directory>
             </resource>
             <resource>
@@ -222,6 +230,7 @@
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
+                    <enableRulesSummary>false</enableRulesSummary>
                 </configuration>
             </plugin>
 

Modified: jakarta/commons/proper/validator/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/project.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/project.xml (original)
+++ jakarta/commons/proper/validator/trunk/project.xml Sun Jan  7 21:36:12 2007
@@ -394,14 +394,13 @@
     </unitTest>
 
     <resources>
-    <resource>
-      <directory>src/main/resources</directory>
-      <targetPath></targetPath>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>NOTICE.txt</include>
-      </includes>
-    </resource>
+      <resource>
+        <directory>${basedir}</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
   </resources>
 
 

Modified: jakarta/commons/proper/validator/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/src/main/assembly/bin.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/main/assembly/bin.xml (original)
+++ jakarta/commons/proper/validator/trunk/src/main/assembly/bin.xml Sun Jan  7 21:36:12 2007
@@ -24,15 +24,9 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>RELEASE-NOTES.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
+                <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
         <fileSet>

Modified: jakarta/commons/proper/validator/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/validator/trunk/src/main/assembly/src.xml?view=diff&rev=493957&r1=493956&r2=493957
==============================================================================
--- jakarta/commons/proper/validator/trunk/src/main/assembly/src.xml (original)
+++ jakarta/commons/proper/validator/trunk/src/main/assembly/src.xml Sun Jan  7 21:36:12 2007
@@ -25,22 +25,16 @@
  -->
     <fileSets>
         <fileSet>
-            <directory>src/main/resources</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <includes>
                 <include>build.properties.sample</include>
                 <include>build.xml</include>
                 <include>build-javascript.xml</include>
                 <include>doap_validator.rdf</include>
                 <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>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message