Author: carnold
Date: Tue Jun 5 15:52:11 2007
New Revision: 544666
URL: http://svn.apache.org/viewvc?view=rev&rev=544666
Log:
Bug 42595: Backport o.a.l.varia.SoundAppender as a companion
Added:
logging/log4j/companions/sound/
- copied from r544237, logging/log4j/companions/logmf/
logging/log4j/companions/sound/trunk/build.xml
- copied, changed from r544492,
logging/log4j/companions/logmf/trunk/build.xml
logging/log4j/companions/sound/trunk/pom.xml
- copied, changed from r544483,
logging/log4j/companions/logmf/trunk/pom.xml
logging/log4j/companions/sound/trunk/src/assembly/
- copied from r544483, logging/log4j/companions/logmf/trunk/src/assembly/
logging/log4j/companions/sound/trunk/src/changes/changes.xml
- copied, changed from r544483,
logging/log4j/companions/logmf/trunk/src/changes/changes.xml
logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/
logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java
- copied, changed from r544659,
logging/log4j/trunk/src/java/org/apache/log4j/varia/SoundAppender.java
logging/log4j/companions/sound/trunk/src/site/apt/
- copied from r544483, logging/log4j/companions/logmf/trunk/src/site/apt/
logging/log4j/companions/sound/trunk/src/site/site.xml
- copied, changed from r544487,
logging/log4j/companions/logmf/trunk/src/site/site.xml
logging/log4j/companions/sound/trunk/src/test/java/org/apache/log4j/varia/
logging/log4j/companions/sound/trunk/src/test/resources/org/apache/log4j/varia/
Removed:
logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/LogMF.java
logging/log4j/companions/sound/trunk/src/test/java/org/apache/log4j/LogCapture.java
logging/log4j/companions/sound/trunk/src/test/java/org/apache/log4j/TestLogMF.java
logging/log4j/companions/sound/trunk/src/test/java/org/apache/log4j/VectorAppender.java
logging/log4j/companions/sound/trunk/src/test/resources/org/apache/log4j/TestLogMFPatterns.properties
Modified:
logging/log4j/companions/sound/trunk/ (props changed)
logging/log4j/companions/sound/trunk/src/assembly/bin.xml
logging/log4j/companions/sound/trunk/src/site/apt/download.apt
logging/log4j/companions/sound/trunk/src/site/apt/index.apt
logging/log4j/companions/sound/trunk/src/site/apt/roadmap.apt
Propchange: logging/log4j/companions/sound/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jun 5 15:52:11 2007
@@ -1 +1,9 @@
target
+cobertura.ser
+surefire*
+.classpath
+.project
+.settings
+apache-log4j-sound*
+
+
Copied: logging/log4j/companions/sound/trunk/build.xml (from r544492,
logging/log4j/companions/logmf/trunk/build.xml)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/build.xml?view=diff&rev=544666&p1=logging/log4j/companions/logmf/trunk/build.xml&r1=544492&p2=logging/log4j/companions/sound/trunk/build.xml&r2=544666
==============================================================================
--- logging/log4j/companions/logmf/trunk/build.xml (original)
+++ logging/log4j/companions/sound/trunk/build.xml Tue Jun 5 15:52:11 2007
@@ -27,8 +27,8 @@
<property file="build.properties"/>
<!-- project details -->
- <property name="project.name" value="apache-log4j-logmf"/>
- <property name="project.title" value="Apache LogMF Companion for log4j
1.2."/>
+ <property name="project.name" value="apache-log4j-sound"/>
+ <property name="project.title" value="Apache Sound Appender Companion for
log4j 1.2."/>
<property name="project.version" value="1.0"/>
<property name="project.jar"
value="${project.name}-${project.version}.jar"/>
Copied: logging/log4j/companions/sound/trunk/pom.xml (from r544483,
logging/log4j/companions/logmf/trunk/pom.xml)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/pom.xml?view=diff&rev=544666&p1=logging/log4j/companions/logmf/trunk/pom.xml&r1=544483&p2=logging/log4j/companions/sound/trunk/pom.xml&r2=544666
==============================================================================
--- logging/log4j/companions/logmf/trunk/pom.xml (original)
+++ logging/log4j/companions/sound/trunk/pom.xml Tue Jun 5 15:52:11 2007
@@ -19,19 +19,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>log4j</groupId>
- <artifactId>apache-log4j-logmf</artifactId>
+ <artifactId>apache-log4j-sound</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
- <name>Apache LogMF Companion for log4j 1.2.</name>
- <description>This companion provides parameterized logging using the
java.text.MessageFormat.</description>
- <url>http://logging.apache.org/log4j/companions/logmf</url>
+ <name>Apache Sound Appender Companion for log4j 1.2.</name>
+ <description>SoundAppender for log4j 1.2.</description>
+ <url>http://logging.apache.org:80/log4j/companions/sound</url>
<issueManagement>
<system>Bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<ciManagement>
<system>Gump</system>
-
<url>http://vmgump.apache.org/gump/public/logging-log4j-logmf/logging-log4j-logmf/index.html</url>
+
<url>http://vmgump.apache.org/gump/public/logging-log4j-sound/logging-log4j-sound/index.html</url>
</ciManagement>
<mailingLists>
<mailingList>
@@ -65,9 +65,9 @@
</license>
</licenses>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/logmf/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/logmf/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/logmf/trunk</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/logging/log4j/companions/sound/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/logging/log4j/companions/sound/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/logging/log4j/companions/sound/trunk</url>
</scm>
<organization>
<name>Apache Software Foundation</name>
@@ -237,7 +237,7 @@
</repository>
<site>
<id>logging.site</id>
-
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/logmf</url>
+
<url>scp://people.apache.org/www/logging.apache.org/log4j/companions/sound</url>
</site>
</distributionManagement>
</project>
Modified: logging/log4j/companions/sound/trunk/src/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/assembly/bin.xml?view=diff&rev=544666&r1=544483&r2=544666
==============================================================================
--- logging/log4j/companions/sound/trunk/src/assembly/bin.xml (original)
+++ logging/log4j/companions/sound/trunk/src/assembly/bin.xml Tue Jun 5
15:52:11 2007
@@ -21,7 +21,7 @@
<format>zip</format>
<format>tar.gz</format>
</formats>
- <baseDirectory>apache-log4j-logmf-${project.version}</baseDirectory>
+ <baseDirectory>apache-log4j-sound-${project.version}</baseDirectory>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
<fileSet>
@@ -37,7 +37,7 @@
<directory>target</directory>
<outputDirectory>.</outputDirectory>
<includes>
-
<include>apache-log4j-logmf-${project.version}.jar</include>
+
<include>apache-log4j-sound-${project.version}.jar</include>
</includes>
</fileSet>
</fileSets>
Copied: logging/log4j/companions/sound/trunk/src/changes/changes.xml (from
r544483, logging/log4j/companions/logmf/trunk/src/changes/changes.xml)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/changes/changes.xml?view=diff&rev=544666&p1=logging/log4j/companions/logmf/trunk/src/changes/changes.xml&r1=544483&p2=logging/log4j/companions/sound/trunk/src/changes/changes.xml&r2=544666
==============================================================================
--- logging/log4j/companions/logmf/trunk/src/changes/changes.xml (original)
+++ logging/log4j/companions/sound/trunk/src/changes/changes.xml Tue Jun 5
15:52:11 2007
@@ -17,11 +17,11 @@
-->
<document>
<properties>
- <title>logmf</title>
+ <title>sound</title>
</properties>
<body>
<release version="1.0" date="2007-06-05" description="Initial release">
- <action issue="42589" type="add">
+ <action issue="42595" type="add">
Initial release.
</action>
</release>
Copied:
logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java
(from r544659,
logging/log4j/trunk/src/java/org/apache/log4j/varia/SoundAppender.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java?view=diff&rev=544666&p1=logging/log4j/trunk/src/java/org/apache/log4j/varia/SoundAppender.java&r1=544659&p2=logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java&r2=544666
==============================================================================
--- logging/log4j/trunk/src/java/org/apache/log4j/varia/SoundAppender.java
(original)
+++
logging/log4j/companions/sound/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java
Tue Jun 5 15:52:11 2007
@@ -24,6 +24,7 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.spi.LoggingEvent;
+import org.apache.log4j.helpers.LogLog;
/**
* Plays a sound clip created using Applet.newAudioClip when an event is
received.
@@ -46,7 +47,6 @@
private String audioURL;
public SoundAppender() {
- super(true);
}
/**
@@ -63,9 +63,10 @@
*/
try {
clip = Applet.newAudioClip(new URL(audioURL));
- } catch (MalformedURLException mue) {getLogger().error("unable
to initialize SoundAppender", mue);}
+ } catch (MalformedURLException mue) {
+ LogLog.error("unable to initialize SoundAppender", mue);}
if (clip == null) {
- getLogger().error("Unable to initialize SoundAppender");
+ LogLog.error("Unable to initialize SoundAppender");
}
}
@@ -74,7 +75,7 @@
*
* @return audio file
*/
- public final String getAudioURL() {
+ public String getAudioURL() {
return audioURL;
}
Modified: logging/log4j/companions/sound/trunk/src/site/apt/download.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/site/apt/download.apt?view=diff&rev=544666&r1=544483&r2=544666
==============================================================================
--- logging/log4j/companions/sound/trunk/src/site/apt/download.apt (original)
+++ logging/log4j/companions/sound/trunk/src/site/apt/download.apt Tue Jun 5
15:52:11 2007
@@ -13,14 +13,14 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
-Download apache-log4j-logmf
+Download apache-log4j-sound
------
------
------
-Download apache-log4j-logmf
+Download apache-log4j-sound
- Apache LogMF Companion for log4j 1.2 is distributed under the
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version
2.0}}.
+ Apache Sound Companion for log4j 1.2 is distributed under the
{{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version
2.0}}.
The link in the Mirrors column should display a list of available mirrors
with a
default selection based on your inferred location. If you do not see that
page,
@@ -30,9 +30,9 @@
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| apache-log4j-logmf-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz}
apache-log4j-logmf-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz.md5}
apache-log4j-logmf-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.tar.gz.asc}
apache-log4j-logmf-1.0-bin.tar.gz.asc}} |
+| apache-log4j-sound-1.0-bin (tar.gz) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz}
apache-log4j-sound-1.0-bin.tar.gz}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz.md5}
apache-log4j-sound-1.0-bin.tar.gz.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.tar.gz.asc}
apache-log4j-sound-1.0-bin.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| apache-log4j-logmf-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip}
apache-log4j-logmf-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip.md5}
apache-log4j-logmf-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/logmf/1.0/apache-log4j-logmf-1.0-bin.zip.asc}
apache-log4j-logmf-1.0-bin.zip.asc}} |
+| apache-log4j-sound-1.0-bin (zip) |
{{{http://www.apache.org/dyn/closer.cgi/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip}
apache-log4j-sound-1.0-bin.zip}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip.md5}
apache-log4j-sound-1.0-bin.zip.md5}} |
{{{http://www.apache.org/dist/logging/log4j/companions/sound/1.0/apache-log4j-sound-1.0-bin.zip.asc}
apache-log4j-sound-1.0-bin.zip.asc}} |
*-------------------------+---------+----------+-----------+
Please read {{{http://httpd.apache.org/dev/verification.html}Verifying
Apache HTTP Server Releases}}
Modified: logging/log4j/companions/sound/trunk/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/site/apt/index.apt?view=diff&rev=544666&r1=544483&r2=544666
==============================================================================
--- logging/log4j/companions/sound/trunk/src/site/apt/index.apt (original)
+++ logging/log4j/companions/sound/trunk/src/site/apt/index.apt Tue Jun 5
15:52:11 2007
@@ -13,10 +13,10 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- Apache LogMF Companion for log4j 1.2
+ Apache Sound Companion for log4j 1.2
------
------
------
- This companion provides parameterized logging using java.text.MessageFormat
- compatible patterns.
\ No newline at end of file
+ This companion contains SoundAppender which plays a specified audio clip
+ on logging events.
\ No newline at end of file
Modified: logging/log4j/companions/sound/trunk/src/site/apt/roadmap.apt
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/site/apt/roadmap.apt?view=diff&rev=544666&r1=544483&r2=544666
==============================================================================
--- logging/log4j/companions/sound/trunk/src/site/apt/roadmap.apt (original)
+++ logging/log4j/companions/sound/trunk/src/site/apt/roadmap.apt Tue Jun 5
15:52:11 2007
@@ -13,13 +13,13 @@
~~ See the License for the specific language governing permissions and
~~ limitations under the License.
------
- apache-log4j-logmf Roadmap
+ apache-log4j-sound Roadmap
------
Curt Arnold
------
5 June 2007
------
-apache-log4j-logmf Roadmap
+apache-log4j-sound Roadmap
No additional development is currently anticipated.
Copied: logging/log4j/companions/sound/trunk/src/site/site.xml (from r544487,
logging/log4j/companions/logmf/trunk/src/site/site.xml)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/sound/trunk/src/site/site.xml?view=diff&rev=544666&p1=logging/log4j/companions/logmf/trunk/src/site/site.xml&r1=544487&p2=logging/log4j/companions/sound/trunk/src/site/site.xml&r2=544666
==============================================================================
--- logging/log4j/companions/logmf/trunk/src/site/site.xml (original)
+++ logging/log4j/companions/sound/trunk/src/site/site.xml Tue Jun 5 15:52:11
2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<project name="logmf">
+<project name="sound">
<bannerLeft>
<name>Logging Services</name>
<src>images/ls-logo.jpg</src>
@@ -32,16 +32,16 @@
<item name="Logging Services" href="http://logging.apache.org/"/>
<item name="log4j" href="http://logging.apache.org/log4j/"/>
<item name="Companions"
href="http://logging.apache.org/log4j/companions/"/>
- <item name="LogMF"
href="http://logging.apache.org:80/log4j/companions/logmf/"/>
+ <item name="Sound"
href="http://logging.apache.org:80/log4j/companions/sound/"/>
</breadcrumbs>
- <menu name="Get LogMF">
+ <menu name="Get Sound">
<item name="Download" href="/download.html"/>
<item name="Changes" href="/changes-report.html"/>
<item name="License" href="/license.html"/>
</menu>
- <menu name="About LogMF">
+ <menu name="About Sound">
<item name="What is it?" href="/index.html"/>
<item name="Roadmap" href="/roadmap.html"/>
<item name="JavaDoc" href="/apidocs/index.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
