ceki 2004/11/18 03:52:30
Modified: src/java/org/apache/log4j/or ObjectRenderer.java
src/java/org/apache/log4j/or/jms MessageRenderer.java
Log:
Clean up
Revision Changes Path
1.6 +19 -11
logging-log4j/src/java/org/apache/log4j/or/ObjectRenderer.java
Index: ObjectRenderer.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/or/ObjectRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectRenderer.java 20 May 2002 09:52:57 -0000 1.5
+++ ObjectRenderer.java 18 Nov 2004 11:52:29 -0000 1.6
@@ -1,22 +1,30 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.txt file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.or;
-/**
- Implement this interface in order to render objects as strings.
- @author Ceki Gülcü
- @since 1.0 */
+/**
+ * Implement this interface in order to render objects as strings.
+ *
+ * @author Ceki Gülcü
+ * @since 1.0 */
public interface ObjectRenderer {
-
/**
Render the object passed as parameter as a String.
*/
- public
- String doRender(Object o);
+ public String doRender(Object o);
}
1.5 +58 -52
logging-log4j/src/java/org/apache/log4j/or/jms/MessageRenderer.java
Index: MessageRenderer.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/or/jms/MessageRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MessageRenderer.java 5 Aug 2004 19:25:51 -0000 1.4
+++ MessageRenderer.java 18 Nov 2004 11:52:30 -0000 1.5
@@ -1,18 +1,27 @@
/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * Copyright 1999,2004 The Apache Software Foundation.
*
- * This software is published under the terms of the Apache Software
- * License version 1.1, a copy of which has been included with this
- * distribution in the LICENSE.txt file. */
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.log4j.or.jms;
-import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.or.ObjectRenderer;
-import javax.jms.Message;
-import javax.jms.JMSException;
import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
/**
Render <code>javax.jms.Message</code> objects.
@@ -20,59 +29,56 @@
@author Ceki Gülcü
@since 1.0 */
public class MessageRenderer implements ObjectRenderer {
-
- public
- MessageRenderer() {
+ public MessageRenderer() {
}
-
/**
Render a [EMAIL PROTECTED] javax.jms.Message}.
*/
- public
- String doRender(Object o) {
- if(o instanceof Message) {
+ public String doRender(Object o) {
+ if (o instanceof Message) {
StringBuffer sbuf = new StringBuffer();
Message m = (Message) o;
try {
- sbuf.append("DeliveryMode=");
- switch(m.getJMSDeliveryMode()) {
- case DeliveryMode.NON_PERSISTENT :
- sbuf.append("NON_PERSISTENT");
- break;
- case DeliveryMode.PERSISTENT :
- sbuf.append("PERSISTENT");
- break;
- default: sbuf.append("UNKNOWN");
- }
- sbuf.append(", CorrelationID=");
- sbuf.append(m.getJMSCorrelationID());
-
- sbuf.append(", Destination=");
- sbuf.append(m.getJMSDestination());
-
- sbuf.append(", Expiration=");
- sbuf.append(m.getJMSExpiration());
-
- sbuf.append(", MessageID=");
- sbuf.append(m.getJMSMessageID());
-
- sbuf.append(", Priority=");
- sbuf.append(m.getJMSPriority());
-
- sbuf.append(", Redelivered=");
- sbuf.append(m.getJMSRedelivered());
-
- sbuf.append(", ReplyTo=");
- sbuf.append(m.getJMSReplyTo());
-
- sbuf.append(", Timestamp=");
- sbuf.append(m.getJMSTimestamp());
-
- sbuf.append(", Type=");
- sbuf.append(m.getJMSType());
- } catch(JMSException e) {
- LogLog.error("Could not parse Message.", e);
+ sbuf.append("DeliveryMode=");
+ switch (m.getJMSDeliveryMode()) {
+ case DeliveryMode.NON_PERSISTENT:
+ sbuf.append("NON_PERSISTENT");
+ break;
+ case DeliveryMode.PERSISTENT:
+ sbuf.append("PERSISTENT");
+ break;
+ default:
+ sbuf.append("UNKNOWN");
+ }
+ sbuf.append(", CorrelationID=");
+ sbuf.append(m.getJMSCorrelationID());
+
+ sbuf.append(", Destination=");
+ sbuf.append(m.getJMSDestination());
+
+ sbuf.append(", Expiration=");
+ sbuf.append(m.getJMSExpiration());
+
+ sbuf.append(", MessageID=");
+ sbuf.append(m.getJMSMessageID());
+
+ sbuf.append(", Priority=");
+ sbuf.append(m.getJMSPriority());
+
+ sbuf.append(", Redelivered=");
+ sbuf.append(m.getJMSRedelivered());
+
+ sbuf.append(", ReplyTo=");
+ sbuf.append(m.getJMSReplyTo());
+
+ sbuf.append(", Timestamp=");
+ sbuf.append(m.getJMSTimestamp());
+
+ sbuf.append(", Type=");
+ sbuf.append(m.getJMSType());
+ } catch (JMSException e) {
+ return o.toString();
}
return sbuf.toString();
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
