psmith 2005/02/21 15:32:13
Modified: src/java/org/apache/log4j/chainsaw/version
VersionManager.java
src chainsawWebStart.jnlp chainsaw.bat
. build-chainsaw.xml build.xml
src/java/org/apache/log4j/chainsaw/help release-notes.html
Added: src chainsaw.sh
Log:
* Modifications to the Chainsaw build process to ensure the Webstart &
non-webstart bundles are built correctly.
* Tweaked chainsaw.bat to include the correct jars (now that there's more of
them)
* Added chainsaw.sh for "Nix users
* updated the Webstart JNLP template file to reflect the required jars
* Update the Version and release notes
Revision Changes Path
1.18 +1 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
Index: VersionManager.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- VersionManager.java 7 Dec 2004 09:34:59 -0000 1.17
+++ VersionManager.java 21 Feb 2005 23:32:13 -0000 1.18
@@ -10,7 +10,7 @@
private static final VersionManager instance = new VersionManager();
- private static final String VERSION_INFO = "1.99.99 (7 December 2004)";
+ private static final String VERSION_INFO = "1.99.99 (22 February 2005)";
public static final VersionManager getInstance() {
return instance;
1.5 +6 -2 logging-log4j/src/chainsawWebStart.jnlp
Index: chainsawWebStart.jnlp
===================================================================
RCS file: /home/cvs/logging-log4j/src/chainsawWebStart.jnlp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chainsawWebStart.jnlp 14 Dec 2004 21:56:36 -0000 1.4
+++ chainsawWebStart.jnlp 21 Feb 2005 23:32:13 -0000 1.5
@@ -20,8 +20,12 @@
<resources>
<j2se version="1.4+" max-heap-size="256m"/>
<j2se version="1.3+" max-heap-size="256m"/>
- <jar href="lib/log4j-chainsaw-1.3alpha-4.jar"/>
- <jar href="lib/log4j-1.3alpha-4.jar"/>
+ <jar href="lib/log4j-chainsaw-1.3alpha-7.jar"/>
+ <jar href="lib/log4j-1.3alpha-7.jar"/>
+ <jar href="lib/log4j-optional.jar"/>
+ <jar href="lib/log4j-xml.jar"/>
+ <jar href="lib/log4j-oro.jar"/>
+ <jar href="lib/ugli-simple.jar"/>
<jar href="lib/jakarta-oro-2.0.6.jar"/>
</resources>
<application-desc main-class="org.apache.log4j.chainsaw.LogUI"/>
1.3 +1 -2 logging-log4j/src/chainsaw.bat
Index: chainsaw.bat
===================================================================
RCS file: /home/cvs/logging-log4j/src/chainsaw.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chainsaw.bat 14 Dec 2004 21:56:36 -0000 1.2
+++ chainsaw.bat 21 Feb 2005 23:32:13 -0000 1.3
@@ -1,2 +1 @@
-java -classpath
jakarta-oro-2.0.6.jar;log4j-1.3alpha-4.jar;log4j-chainsaw-1.3alpha-4.jar
org.apache.log4j.chainsaw.LogUI
-
+java -classpath
log4j-1.3alpha-7.jar;log4j-chainsaw-1.3alpha-7.jar;ugli-simple.jar;log4j-xml.jar;log4j-optional.jar;log4j-oro.jar
org.apache.log4j.chainsaw.LogUI
\ No newline at end of file
1.1 logging-log4j/src/chainsaw.sh
Index: chainsaw.sh
===================================================================
#!/bin/sh
java -classpath
log4j-1.3alpha-7.jar:log4j-chainsaw-1.3alpha-7.jar:ugli-simple.jar:log4j-xml.jar:log4j-optional.jar:log4j-oro.jar
org.apache.log4j.chainsaw.LogUI
1.6 +3 -2 logging-log4j/build-chainsaw.xml
Index: build-chainsaw.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build-chainsaw.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build-chainsaw.xml 19 Jan 2005 21:22:59 -0000 1.5
+++ build-chainsaw.xml 21 Feb 2005 23:32:13 -0000 1.6
@@ -7,6 +7,7 @@
<path id="compile.classpath">
<pathelement location="${javac.dest}"/>
<pathelement location="${vfs.jar}"/>
+ <pathelement location="${jakarta-oro.jar}"/>
</path>
<path id="runtime.classpath">
@@ -15,7 +16,7 @@
</fileset>
<pathelement location="${vfs.jar}"/>
<pathelement location="${jaxp.parser.jar}"/>
- <pathelement location="${jakarta-.oro.jar}"/>
+ <pathelement location="${jakarta-oro.jar}"/>
<pathelement location="${jms.jar}"/>
</path>
@@ -205,7 +206,7 @@
<include name="*.jar"/>
</zipfileset>
<fileset file="${jakarta-oro.jar}"/>
- <fileset file="src/chainsaw.bat"/>
+ <fileset file="src/chainsaw.*"/>
</zip>
</target>
1.149 +4 -2 logging-log4j/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/logging-log4j/build.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- build.xml 10 Feb 2005 12:23:39 -0000 1.148
+++ build.xml 21 Feb 2005 23:32:13 -0000 1.149
@@ -172,7 +172,7 @@
</available>
<fail unless="jms-present">
- Missing java.jms.* classes.
+ Missing javax.jms.* classes.
Please make sure to that the "jms.jar" poperty in build.properties
file is set correctly.
@@ -299,7 +299,9 @@
<ant antfile="build-chainsaw.xml" target="chainsaw"/>
</target>
- <target name="webstart" depends="build.chainsaw">
+ <target name="webstart" depends="ugli.jar, log4j.jar, log4j-optional.jar,
+ chainsaw.jar, log4j-jms.jar, log4j-smtp.jar,
+ log4j-db.jar, log4j-oro.jar, log4j-xml.jar">
<ant antfile="build-chainsaw.xml" target="webstart"/>
</target>
1.49 +8 -0
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- release-notes.html 7 Dec 2004 09:35:00 -0000 1.48
+++ release-notes.html 21 Feb 2005 23:32:13 -0000 1.49
@@ -9,6 +9,14 @@
<h1>1.99.99</h2>
+<h2>22 February 2005</h2>
+<ul>
+<li>It's been so long since the last build it's a bit hard to remember
exactly what has changed, but
+the most significant change has been how log4j and chainsaw gets build, with
the addition of the UGLI
+interfaces. log4j is now bundled in a set of smaller jars.</li>
+<li>Standalone distribution now includes a basic chainsaw.sh for you Unix
folk (I have a Mac now, I have no excuse
+not to provide this, be on the look out for a Mac OS X bundle version soon -
Paul)</li>
+</ul>
<h2>7 December 2004</h2>
<ul>
<li>Changed the default order of columns in Chainsaw to first display ID,
level, logger, message and exception</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
