From 78b3c9dcd4b2ec1dcec7cb8e95ceb12c74e8765a Mon Sep 17 00:00:00 2001
From: Robert Burrell Donkin <rdonkin@apache.org>
Date: Tue, 7 Feb 2006 21:10:28 +0000
Subject: [PATCH] Consolidated source and javadocs into single jar.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@375707 13f79535-47bb-0310-9956-ffa450edef68
---
 RELEASE-NOTES.txt |  2 ++
 build.xml         | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 951c860..100fb5b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -111,6 +111,8 @@ Jakarta Commons Logging wiki site:
 
 * Better behaviour for systems with null classloaders (generally embedded systems).
 
+* New zip file containing source and javadocs for those using modern IDEs.
+
 == Incompatibilities ==
 
 There are no changes for code that calls LogFactory or Log methods. This means
diff --git a/build.xml b/build.xml
index 3f7dc11..cf5f06d 100644
--- a/build.xml
+++ b/build.xml
@@ -116,8 +116,7 @@
   <property name="core.jar.name" value="commons-${component.name}-${component.version}.jar"/>
   <property name="api.jar.name" value="commons-${component.name}-api-${component.version}.jar"/>
   <property name="adapters.jar.name" value="commons-${component.name}-adapters-${component.version}.jar"/>
-  <property name="src.ide.name" value="commons-${component.name}-${component.version}-src-ide.zip"/>
-  <property name="javadoc.ide.name" value="commons-${component.name}-${component.version}-javadoc-ide.zip"/>
+  <property name="src.ide.name" value="commons-${component.name}-${component.version}-ide.zip"/>
 	
   <!-- dist names -->
   <property name="windows.dist.name" value="commons-${component.name}-${component.version}.zip"/>
@@ -631,6 +630,14 @@ This configuration is typically used to create a release only.
       </fileset>
     </copy>
   	
+  	<!--
+  	Copy documentation generated by maven
+  	-->
+    <mkdir dir="${dist.home}/docs"/>
+    <copy todir="${dist.home}/docs">
+      <fileset dir="${build.home}/docs"/>
+    </copy>
+  	
     <!--
       - And copy the source too; we don't have separate source and binary distributions
       - for logging; the source is so small there's little point.
@@ -641,20 +648,6 @@ This configuration is typically used to create a release only.
     </copy>
   	<zip destfile='${dist.home}/${src.ide.name}'>
   		<zipfileset dir='${dist.home}/src'/>
-  		<zipfileset dir='${dist.home}' prefix='META-INF'>
-  	        <include name="LICENSE.txt"/>
-  	        <include name="NOTICE.txt"/>
-  		</zipfileset>
-  	</zip>
-  	
-  	<!--
-  	Copy documentation generated by maven
-  	-->
-    <mkdir dir="${dist.home}/docs"/>
-    <copy todir="${dist.home}/docs">
-      <fileset dir="${build.home}/docs"/>
-    </copy>
-  	<zip destfile='${dist.home}/${javadoc.ide.name}'>
   		<zipfileset dir='${dist.home}/docs/apidocs'/>
   		<zipfileset dir='${dist.home}' prefix='META-INF'>
   	        <include name="LICENSE.txt"/>