Author: carnold
Date: Sat Jun 19 20:17:19 2010
New Revision: 956285
URL: http://svn.apache.org/viewvc?rev=956285&view=rev
Log:
Bug 43282: Duplicate classes in o.a.l.extras so they are visible to OSGi clients
Added:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/SoundAppender.java
- copied, changed from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/UtilLoggingLevel.java
- copied, changed from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/XSLTLayout.java
- copied, changed from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java
Copied:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/SoundAppender.java
(from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/SoundAppender.java?p2=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/SoundAppender.java&p1=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java&r1=952531&r2=956285&rev=956285&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/varia/SoundAppender.java
(original)
+++
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/SoundAppender.java
Sat Jun 19 20:17:19 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.varia;
+package org.apache.log4j.extras;
import java.applet.Applet;
import java.applet.AudioClip;
@@ -27,6 +27,9 @@ import org.apache.log4j.spi.LoggingEvent
import org.apache.log4j.helpers.LogLog;
/**
+ * This class is equivalent to org.apache.log4j.varia.SoundAppender
+ * except for a package change to aid in use with OSGi.
+ *
* Plays a sound clip created using Applet.newAudioClip when an event is
received.
*
* If the audio format is not supported, a message stating the SoundAppender
could
Copied:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/UtilLoggingLevel.java
(from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/UtilLoggingLevel.java?p2=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/UtilLoggingLevel.java&p1=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java&r1=952531&r2=956285&rev=956285&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java
(original)
+++
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/UtilLoggingLevel.java
Sat Jun 19 20:17:19 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.log4j.helpers;
+package org.apache.log4j.extras;
import java.util.ArrayList;
import java.util.List;
@@ -23,6 +23,9 @@ import java.util.List;
import org.apache.log4j.Level;
/**
+ * This class is identical to org.apache.log4j.helpers.UtilLoggingLevel
+ * except for a package change to aid in use with OSGi.
+ *
* An extension of the Level class that provides support for java.util.logging
* Levels.
*
Copied:
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/XSLTLayout.java
(from r952531,
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/XSLTLayout.java?p2=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/XSLTLayout.java&p1=logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java&r1=952531&r2=956285&rev=956285&view=diff
==============================================================================
---
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/xml/XSLTLayout.java
(original)
+++
logging/log4j/companions/extras/trunk/src/main/java/org/apache/log4j/extras/XSLTLayout.java
Sat Jun 19 20:17:19 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.log4j.xml;
+package org.apache.log4j.extras;
import org.apache.log4j.Layout;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.helpers.MDCKeySetExtractor;
@@ -51,6 +51,10 @@ import org.xml.sax.helpers.AttributesImp
/**
+ * This class is identical to org.apache.log4j.xml.XSLTLayout
+ * except for a change in package to aid in use with OSGi.
+ *
+ *
* XSLTLayout transforms each event as a document using
* a specified or default XSLT transform. The default
* XSLT transform produces a result similar to XMLLayout.
@@ -93,7 +97,7 @@ import org.xml.sax.helpers.AttributesImp
*
*/
public final class XSLTLayout extends Layout
- implements UnrecognizedElementHandler {
+ implements org.apache.log4j.xml.UnrecognizedElementHandler {
/**
* Namespace for XSLT.
*/
@@ -377,9 +381,9 @@ public final class XSLTLayout extends La
if (body.startsWith("<?xml ")) {
int endDecl = body.indexOf("?>");
if (endDecl != -1) {
- for(endDecl += 2;
- endDecl < body.length() &&
- (body.charAt(endDecl) == '\n'
|| body.charAt(endDecl) == '\r');
+ for(endDecl += 2;
+ endDecl < body.length() &&
+ (body.charAt(endDecl) == '\n'
|| body.charAt(endDecl) == '\r');
endDecl++);
return body.substring(endDecl);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
