Author: sdeboy
Date: Sat Sep 11 08:42:09 2010
New Revision: 996096
URL: http://svn.apache.org/viewvc?rev=996096&view=rev
Log:
Removed use of now-in-the-attic Jakarta ORO. Now using java.util.regex package
in LogFilePatternReceiver (java 1.4). Also removed ORO from receivers pom.
Modified:
logging/chainsaw/trunk/build.xml
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/ChainsawAbout.html
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/package.html
Modified: logging/chainsaw/trunk/build.xml
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/build.xml?rev=996096&r1=996095&r2=996096&view=diff
==============================================================================
--- logging/chainsaw/trunk/build.xml (original)
+++ logging/chainsaw/trunk/build.xml Sat Sep 11 08:42:09 2010
@@ -67,7 +67,6 @@
<fileset dir="${deps.dir}">
<include name="*.jar"/>
</fileset>
- <pathelement location="${jakarta-oro.jar}"/>
<pathelement location="${log4j-chainsaw.jar}"/>
</path>
Modified:
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java?rev=996096&r1=996095&r2=996096&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
(original)
+++
logging/chainsaw/trunk/src/main/java/org/apache/log4j/chainsaw/vfs/VFSLogFilePatternReceiver.java
Sat Sep 11 08:42:09 2010
@@ -38,9 +38,6 @@ import javax.swing.JPasswordField;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
-import com.jcraft.jsch.UIKeyboardInteractive;
-import com.jcraft.jsch.UserInfo;
-
import org.apache.commons.vfs.FileObject;
import org.apache.commons.vfs.FileSystemException;
import org.apache.commons.vfs.FileSystemManager;
@@ -86,7 +83,7 @@ import org.apache.log4j.varia.LogFilePat
* An sftp URI that would be used with promptForUserInfo=false:
* sftp://username:[email protected]:22/home/thisuser/logfile.txt
* <p>
- * This receiver relies on ORO Perl5 features to perform the parsing of text
in the
+ * This receiver relies on java.util.regex features to perform the parsing of
text in the
* log file, however the only regular expression field explicitly supported is
* a glob-style wildcard used to ignore fields in the log file if needed. All
other
* fields are parsed by using the supplied keywords.
Modified:
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/ChainsawAbout.html
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/ChainsawAbout.html?rev=996096&r1=996095&r2=996096&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/ChainsawAbout.html
(original)
+++
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/ChainsawAbout.html
Sat Sep 11 08:42:09 2010
@@ -36,7 +36,7 @@
<tr><td>Stephen Pain</td></tr>
<tr><td>Isuru Suriarachchi</td></tr>
<tr><td colspan="2"> </td></tr>
-<tr valign="top"><td rowspan="3">Using the following technologies</td><td><a
href="http://jakarta.apache.org/oro/index.html";>Apache Jakarta ORO</a></td></tr>
+<tr valign="top"><td rowspan="3">Using the following technologies</td></tr>
<tr valign="top"><td><a href="http://jakarta.apache.org/commons/vfs/";>Jakarta
Commons VFS</a></td></tr>
<tr valign="top"><td><a href="http://xstream.codehaus.org/";>XStream (BSD
License)</a></td></tr>
Modified:
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html?rev=996096&r1=996095&r2=996096&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
(original)
+++
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/help/release-notes.html
Sat Sep 11 08:42:09 2010
@@ -284,7 +284,7 @@ not to provide this, be on the look out
<h2>9 September 2004</h2>
<ul>
-<li>Rewrote LogFilePatternReceiver to add support for multi-line messages and
improved parsing logic. To use this receiver you must now have the ORO library
in your classpath (ORO is included in the WebStart version).</li>
+<li>Rewrote LogFilePatternReceiver to add support for multi-line messages and
improved parsing logic.</li>
</ul>
<h2>2 September 2004</h2>
Modified:
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/package.html
URL:
http://svn.apache.org/viewvc/logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/package.html?rev=996096&r1=996095&r2=996096&view=diff
==============================================================================
---
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/package.html
(original)
+++
logging/chainsaw/trunk/src/main/resources/org/apache/log4j/chainsaw/package.html
Sat Sep 11 08:42:09 2010
@@ -65,14 +65,13 @@ displays them in a table. The events can
<H2>Requirements</H2>
- <P>Chainsaw is based on the Swing API which requires JDK 1.2 or later, and
also relies on the <a href="http://jakarta.apache.org/oro/index.html";>Jakarta
ORO regular
- expression package</a>.</P>
+ <P>Chainsaw is based on the Swing API and requires JDK 1.4 or later.</P>
<H2>Running chainsaw</H2>
<H3>Setup</H3>
- <P>You need to include the <code>log4j.jar</code> and the
<code>jakarta-oro.jar</code> in the classpath.
+ <P>You need to include the <code>log4j.jar</code> and
<code>xstream.jar</code> in the classpath.
<H3>Usage</H3>
