svn commit: r541896 - in /jakarta/jcs/trunk: maven.xml project.properties project.xml

Author: tv
Date: Sat May 26 07:05:16 2007
New Revision: 541896

URL: http://svn.apache.org/viewvc?view=rev&rev=541896
Log:
- Make sure the NOTICE and LICENSE.txt files are included in all 
published artifacts
- Add a couple of settings to the project.properties

Modified:
    jakarta/jcs/trunk/maven.xml
    jakarta/jcs/trunk/project.properties
    jakarta/jcs/trunk/project.xml

Modified: jakarta/jcs/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/maven.xml?view=diff&rev=541896&r1=541895&r2=541896
==============================================================================
--- jakarta/jcs/trunk/maven.xml (original)
+++ jakarta/jcs/trunk/maven.xml Sat May 26 07:05:16 2007
@@ -73,4 +73,39 @@
     <ant:echo>Not generating the .project file.</ant:echo>
   </goal>
 
+  <!-- ================================================================== -->
+  <!-- D I S T : B U I L D _ B I N   P R E   G O A L                      -->
+  <!-- ================================================================== -->
+  <!-- copies NOTICE, LICENSE.txt                                         -->
+  <!-- ${maven.dist.bin.assembly.dir} to include them in the binary dists -->
+  <!-- ================================================================== -->
+  <preGoal name="dist:build-bin">
+    <!-- include listed dependencies -->
+    <!-- j:forEach var="dep" items="${pom.dependencies}">
+      <j:if test="${dep.getProperty('dist.bundle') != null &amp;&amp; dep.getProperty('dist.bundle').equalsIgnoreCase('true')}">
+        <copy todir="${maven.dist.bin.assembly.dir}/lib"
+              file="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
+      </j:if>
+    </j:forEach -->
+
+    <copy todir="${maven.dist.bin.assembly.dir}" failonerror="false">
+      <fileset file='${basedir}/NOTICE'/>
+      <fileset file='${basedir}/LICENSE.txt'/>
+    </copy>
+  </preGoal>
+
+  <!-- ================================================================== -->
+  <!-- D I S T : B U I L D _ S R C   P R E   G O A L                      -->
+  <!-- ================================================================== -->
+  <preGoal name="dist:build-src">
+      <copy todir="${maven.dist.src.assembly.dir}">
+      <fileset dir="${basedir}">
+        <include name="project.xml"/>
+        <include name="project.properties"/>
+        <include name="NOTICE"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
+  </preGoal>
+
 </project>

Modified: jakarta/jcs/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/project.properties?view=diff&rev=541896&r1=541895&r2=541896
==============================================================================
--- jakarta/jcs/trunk/project.properties (original)
+++ jakarta/jcs/trunk/project.properties Sat May 26 07:05:16 2007
@@ -19,6 +19,10 @@
 # -------------------------------------------------------------------
 maven.repo.remote=http://ibiblio.org/maven,http://repository.codehaus.org/org/codehaus/mojo/,http://maven-plugins.sourceforge.net,http://maven-plugins.sourceforge.net/repository/maven-plugins/,http://repo1.maven.org/maven
 
+maven.repo.list=apache
+maven.repo.apache=scp://people.apache.org
+maven.repo.apache.directory=/www/people.apache.org/repo/m1-ibiblio-rsync-repository
+
 # -------------------------------------------------------------------
 # XDOC
 # -------------------------------------------------------------------
@@ -69,3 +73,21 @@
 # C H A N G E L O G  P R O P E R T I E S
 # -------------------------------------------------------------------
 maven.changelog.range=360
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+
+# -------------------------------------------------------------------
+# L I C E N S E  P R O P E R T I E S
+# -------------------------------------------------------------------
+maven.license.licenseFile = ${basedir}/LICENSE.txt
+
+# -------------------------------------------------------------------
+# C H A N G E S  P R O P E R T I E S
+# -------------------------------------------------------------------
+maven.changes.issue.template = http://issues.apache.org/jira/browse/%ISSUE%
+
+# -------------------------------------------------------------------
+# X D O C  P R O P E R T I E S
+# -------------------------------------------------------------------
+# display the date on the site
+maven.xdoc.date = left
+maven.xdoc.locale.default = en

Modified: jakarta/jcs/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/jcs/trunk/project.xml?view=diff&rev=541896&r1=541895&r2=541896
==============================================================================
--- jakarta/jcs/trunk/project.xml (original)
+++ jakarta/jcs/trunk/project.xml Sat May 26 07:05:16 2007
@@ -43,9 +43,10 @@
 	</issueTrackingUrl>
 	<siteAddress>people.apache.org</siteAddress>
 	<siteDirectory>/www/jakarta.apache.org/jcs/</siteDirectory>
-	<distributionDirectory>
-		/www/jakarta.apache.org/builds/jakarta-jcs/
-	</distributionDirectory>
+    <distributionSite>www.apache.org</distributionSite>
+    <distributionDirectory>
+        /www/www.apache.org/dist/java-repository
+    </distributionDirectory>
 
 	<repository>
 		<connection>
@@ -345,6 +346,15 @@
 				</resource>
 			</resources>
 		</unitTest>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                  <include>NOTICE</include>
+                </includes>
+            </resource>
+        </resources>
 	</build>
 
 	<reports>