logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From psm...@apache.org
Subject svn commit: r376082 - in /logging/chainsaw/trunk: build.properties.sample build.xml src/java/org/apache/log4j/chainsaw/help/release-notes.html src/java/org/apache/log4j/chainsaw/version/VersionManager.java
Date Wed, 08 Feb 2006 21:37:36 GMT
Author: psmith
Date: Wed Feb  8 13:37:12 2006
New Revision: 376082

URL: http://svn.apache.org/viewcvs?rev=376082&view=rev
Log:
Fix for Bug #38582.  Since Chainsaw moved out into it's own SVN repo,
it appears that the distribution no longer built all the Receiver Java Doc (because
they are still in the log4j source path.

Changed the build sequence so that to get the JavaDoc for Receivers requires the 
location of the log4j source code.  Failing to have this just means that Chainsaw
doesn't have all the JavaDoc embedded.

Modified:
    logging/chainsaw/trunk/build.properties.sample
    logging/chainsaw/trunk/build.xml
    logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/help/release-notes.html
    logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/version/VersionManager.java

Modified: logging/chainsaw/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/logging/chainsaw/trunk/build.properties.sample?rev=376082&r1=376081&r2=376082&view=diff
==============================================================================
--- logging/chainsaw/trunk/build.properties.sample (original)
+++ logging/chainsaw/trunk/build.properties.sample Wed Feb  8 13:37:12 2006
@@ -16,7 +16,8 @@
 # See http://jakarta.apache.org/commons/sandbox/vfs/download.html for 
 # file system-specific jars required when running Chainsaw with a VFSLogFilePatternReceiver
 #
-# NOTE: VFS requires Commons logging JAR as well, otherwise it won't work.
+# NOTE: VFS requires Commons logging JAR as well, otherwise it won't work, just grab 
+# the API jar and place it in this directory alongside VFS jar.
 
 # Place all the dependencies in this directory (except ORO)
 # Dependencies directory

Modified: logging/chainsaw/trunk/build.xml
URL: http://svn.apache.org/viewcvs/logging/chainsaw/trunk/build.xml?rev=376082&r1=376081&r2=376082&view=diff
==============================================================================
--- logging/chainsaw/trunk/build.xml (original)
+++ logging/chainsaw/trunk/build.xml Wed Feb  8 13:37:12 2006
@@ -38,6 +38,7 @@
 	<fileset dir="${deps.dir}">
   	  <include name="*.jar"/>
   	</fileset>
+  	<pathelement location="${jms.jar}"/>
   </path>
 
   <path id="runtime.classpath">
@@ -182,7 +183,6 @@
              version="true"
              author="true"
              use="true"
-             overview="${jar.dest}/overview.html"
              doctitle="log4j version ${version}&lt;br&gt;API Specification"
              windowtitle="Log4j Version ${version}"
              header="&lt;b&gt;Log4j ${version}&lt;/b&gt;"
@@ -191,7 +191,10 @@
       <fileset dir="src/" defaultexcludes="yes">
         <include name="**/*Receiver.java" />
       </fileset>
-      <classpath refid="compile.classpath"/>
+        <fileset dir="${log4j.src}/src/" defaultexcludes="yes">
+          <include name="**/*Receiver.java" />
+        </fileset>      
+    	<classpath refid="compile.classpath"/>
         
     </javadoc>        
       
@@ -320,7 +323,10 @@
   	
   	
 	<createshellscripts outputLocation="webstart-dist" scriptType="shell">
-		<fileset dir="webstart-dist" includes="*.jar"/>
+		<fileset dir="webstart-dist" includes="*.jar">
+			<exclude name="commons*.jar"/>
+			<exclude name="*vfs*.jar"/>
+		</fileset>
 	</createshellscripts>
 
   	<!-- Webstart distribution can't have VFS because of stupid classloading rules, so
we exclude it-->
@@ -364,7 +370,10 @@
 		<copy file="${webstart-dependant-receivers.jar}" todir="iSaw-dist"/>
 		<copy file="${log4j-chainsaw.jar}" todir="iSaw-dist"/>
 		<copy todir="iSaw-dist">
-			<fileset dir="lib"/>
+			<fileset dir="lib">
+				<exclude name="commons*.jar"/>
+				<exclude name="*vfs*.jar"/>
+			</fileset>
 		</copy>
 		
 	<taskdef name="jarbundler"

Modified: logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/help/release-notes.html
URL: http://svn.apache.org/viewcvs/logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/help/release-notes.html?rev=376082&r1=376081&r2=376082&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/help/release-notes.html (original)
+++ logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/help/release-notes.html Wed
Feb  8 13:37:12 2006
@@ -8,13 +8,16 @@
 <h1>Release Notes</h2>
 
 <h1>1.99.99</h2>
-
-<h2>06 January 2006</h2>
+<h2>09 February 2006</h2>
+<ul>
+<li>Receiver help files were missing from the distribution. </li>
+</ul>
+<h2>06 February 2006</h2>
 <ul>
 <li>Save/load of custom event columns now supported, as well as column order.</li>
 </ul>
 <ul><b>NOTE:</b> The mechanism and format used to persist settings in Chainsaw
is changing significantly with this release, and is subject to change during this alpha phase.
 If you are experiencing problems displaying events in Chainsaw, please delete everything
in the $user.dir/.chainsaw directory.</ul>
-<h2>21 November 2005</h2>
+<h2>2 February 2006/h2>
 <ul>
 <li>Revamped build system for easier maintenance and deployment of builds. Fixed issues
with Commons VFS and Webstart.</li>
 </ul>

Modified: logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
URL: http://svn.apache.org/viewcvs/logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/version/VersionManager.java?rev=376082&r1=376081&r2=376082&view=diff
==============================================================================
--- logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
(original)
+++ logging/chainsaw/trunk/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
Wed Feb  8 13:37:12 2006
@@ -10,7 +10,7 @@
 
     private static final VersionManager instance = new VersionManager();
     
-    private static final String VERSION_INFO = "1.99.99 (06 February 2006)";
+    private static final String VERSION_INFO = "1.99.99 (09 February 2006)";
     
     public static final VersionManager getInstance() {
         return instance;



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


Mime
View raw message