ceki 01/09/10 02:31:01 Modified: src/java/org/apache/log4j/or Makefile Added: src/java/org/apache/log4j/or/jms Makefile MessageRenderer.java src/java/org/apache/log4j/or/sax AttributesRenderer.java Makefile Removed: src/java/org/apache/log4j/or MessageRenderer.java Log: Started reorganizing message renderers by package: - Added sax/AttributesRenderer.java. - Moved MessageRenderer.java to jms/MessageRenderer.java. Revision Changes Path 1.5 +5 -6 jakarta-log4j/src/java/org/apache/log4j/or/Makefile Index: Makefile =================================================================== RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/or/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 2001/03/21 21:34:14 1.4 +++ Makefile 2001/09/10 09:31:01 1.5 @@ -1,11 +1,10 @@ PKG_DIR :=org/apache/log4j/or DEPTH :=../../../../../.. -JSOURCES:= ObjectRenderer.java\ - RendererMap.java\ - DefaultRenderer.java\ - ThreadGroupRenderer.java\ - MessageRenderer.java\ +JSOURCES:= DefaultRenderer.java\ + ObjectRenderer.java\ + RendererMap.java\ + ThreadGroupRenderer.java\ #ifdef FULL @@ -13,7 +12,7 @@ #endif -SUBDIRS := +SUBDIRS := jms sax # include master-rule file include $(DEPTH)/make/make.inc 1.1 jakarta-log4j/src/java/org/apache/log4j/or/jms/Makefile Index: Makefile =================================================================== PKG_DIR :=org/apache/log4j/or/sax DEPTH :=../../../../../../.. JSOURCES:= MessageRenderer.java SUBDIRS := # include master-rule file include $(DEPTH)/make/make.inc 1.1 jakarta-log4j/src/java/org/apache/log4j/or/jms/MessageRenderer.java Index: MessageRenderer.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * 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. */ package org.apache.log4j.or.jms; import org.apache.log4j.Layout; 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 java.util.Enumeration; /** Render <code>javax.jms.Message</code> objects. @author Ceki Gülcü @since 1.0 */ public class MessageRenderer implements ObjectRenderer { public MessageRenderer() { } /** Render a {@link 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()); //Enumeration enum = m.getPropertyNames(); //while(enum.hasMoreElements()) { // String key = (String) enum.nextElement(); // sbuf.append("; "+key+"="); // sbuf.append(m.getStringProperty(key)); //} } catch(JMSException e) { LogLog.error("Could not parse Message.", e); } return sbuf.toString(); } else { return o.toString(); } } } 1.1 jakarta-log4j/src/java/org/apache/log4j/or/sax/AttributesRenderer.java Index: AttributesRenderer.java =================================================================== /* * Copyright (C) The Apache Software Foundation. All rights reserved. * * 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. */ package org.apache.log4j.or; import org.apache.log4j.Layout; import org.apache.log4j.helpers.LogLog; import java.util.Enumeration; import org.xml.sax.Attributes; /** Render <code>javax.jms.Message</code> objects. @author Ceki Gülcü @since 1.0 */ public class AttributesRenderer implements ObjectRenderer { public AttributesRenderer() { } /** Render a {@link Message}. */ public String doRender(Object o) { if(o instanceof Attributes) { StringBuffer sbuf = new StringBuffer(); Attributes a = (Attributes) o; int len = a.getLength(); boolean first = true; for(int i = 0; i < len; i++) { if(first) { first = false; } else { sbuf.append(", "); } sbuf.append(a.getURI(i)); sbuf.append(':'); sbuf.append(a.getType(i)); sbuf.append('='); sbuf.append(a.getValue(i)); sbuf.append(a.getValue(i)); } return sbuf.toString(); } else { return o.toString(); } } } 1.1 jakarta-log4j/src/java/org/apache/log4j/or/sax/Makefile Index: Makefile =================================================================== PKG_DIR :=org/apache/log4j/or/sax DEPTH :=../../../../../../.. JSOURCES:= AttributesRenderer.java SUBDIRS := # include master-rule file include $(DEPTH)/make/make.inc --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]