Author: slotia
Date: 2009-08-11 09:38:11 -0700 (Tue, 11 Aug 2009)
New Revision: 17769
Removed:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/Log4jInit.java
Modified:
core3/log-swing/trunk/pom.xml
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/ConsoleTaskFactory.java
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueProcesser.java
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarUpdater.java
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Ported package to use pax-logging-service as a backend--this is the only way I
know how to make it work!
Modified: core3/log-swing/trunk/pom.xml
===================================================================
--- core3/log-swing/trunk/pom.xml 2009-08-11 02:58:59 UTC (rev 17768)
+++ core3/log-swing/trunk/pom.xml 2009-08-11 16:38:11 UTC (rev 17769)
@@ -126,9 +126,14 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
-
<artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>1.2.15</version>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>1.3.0</version>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>1.3.0</version>
+ </dependency>
</dependencies>
</project>
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/ConsoleTaskFactory.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/ConsoleTaskFactory.java
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/ConsoleTaskFactory.java
2009-08-11 16:38:11 UTC (rev 17769)
@@ -6,7 +6,7 @@
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.log.statusbar.CytoStatusBar;
-import org.apache.log4j.spi.LoggingEvent;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
@@ -25,8 +25,8 @@
*/
public class ConsoleTaskFactory implements TaskFactory
{
- final BlockingQueue<LoggingEvent> simpleQueue;
- final BlockingQueue<LoggingEvent> advancedQueue;
+ final BlockingQueue<PaxLoggingEvent> simpleQueue;
+ final BlockingQueue<PaxLoggingEvent> advancedQueue;
final ExecutorService service;
final CytoStatusBar statusBar;
final CySwingApplication app;
@@ -38,8 +38,8 @@
SimpleLogViewer simpleLogViewer = null;
AdvancedLogViewer advancedLogViewer = null;
- public ConsoleTaskFactory( BlockingQueue<LoggingEvent> simpleQueue,
- BlockingQueue<LoggingEvent>
advancedQueue,
+ public ConsoleTaskFactory( BlockingQueue<PaxLoggingEvent>
simpleQueue,
+ BlockingQueue<PaxLoggingEvent>
advancedQueue,
ExecutorService service,
CytoStatusBar statusBar,
CySwingApplication app,
@@ -106,13 +106,13 @@
final SimpleLogViewer simpleLogViewer;
- public SimpleUpdater(SimpleLogViewer simpleLogViewer,
BlockingQueue<LoggingEvent> internalQueue)
+ public SimpleUpdater(SimpleLogViewer simpleLogViewer,
BlockingQueue<PaxLoggingEvent> internalQueue)
{
super(internalQueue);
this.simpleLogViewer = simpleLogViewer;
}
- public void processEvent(LoggingEvent event)
+ public void processEvent(PaxLoggingEvent event)
{
String message = event.getMessage().toString();
String timeStamp = DATE_FORMATTER.format(new
Date(event.getTimeStamp()));
@@ -126,17 +126,17 @@
final AdvancedLogViewer advancedLogViewer;
- public AdvancedUpdater(AdvancedLogViewer advancedLogViewer,
BlockingQueue<LoggingEvent> queue)
+ public AdvancedUpdater(AdvancedLogViewer advancedLogViewer,
BlockingQueue<PaxLoggingEvent> queue)
{
super(queue);
this.advancedLogViewer = advancedLogViewer;
}
- public void processEvent(LoggingEvent event)
+ public void processEvent(PaxLoggingEvent event)
{
String[] formattedEvent = new String[5];
formattedEvent[0] = DATE_FORMATTER.format(new
Date(event.getTimeStamp()));
- formattedEvent[1] = event.getLogger().getName();
+ formattedEvent[1] = event.getLoggerName();
formattedEvent[2] = event.getLevel().toString().toLowerCase();
formattedEvent[3] = event.getThreadName();
formattedEvent[4] = event.getMessage().toString();
Deleted:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/Log4jInit.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/Log4jInit.java
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/Log4jInit.java
2009-08-11 16:38:11 UTC (rev 17769)
@@ -1,16 +0,0 @@
-package org.cytoscape.log.internal;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.Appender;
-
-/**
- * @author Pasteur
- */
-public class Log4jInit
-{
- public Log4jInit(Appender rootAppender)
- {
- Logger log = Logger.getRootLogger();
- log.addAppender(rootAppender);
- }
-}
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueAppender.java
2009-08-11 16:38:11 UTC (rev 17769)
@@ -2,63 +2,35 @@
import java.util.Queue;
-import org.apache.log4j.Appender;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.spi.Filter;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.ops4j.pax.logging.spi.PaxAppender;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
* @author Pasteur
*/
-public class QueueAppender extends AppenderSkeleton implements Appender
+public class QueueAppender implements PaxAppender
{
- public static final LoggingEvent NULL_EVENT = new LoggingEvent(null,
Logger.getRootLogger(), 0, null, null, null);
+ final Queue<PaxLoggingEvent> userLogQueue;
+ final Queue<PaxLoggingEvent> statusBarQueue;
+ final Queue<PaxLoggingEvent> developerLogQueue;
- final Queue<LoggingEvent> userLogQueue;
- final Queue<LoggingEvent> statusBarQueue;
- final Queue<LoggingEvent> developerLogQueue;
-
- public QueueAppender(Queue<LoggingEvent> userLogQueue,
Queue<LoggingEvent> statusBarQueue, Queue<LoggingEvent> developerLogQueue)
+ public QueueAppender(Queue<PaxLoggingEvent> userLogQueue,
Queue<PaxLoggingEvent> statusBarQueue, Queue<PaxLoggingEvent> developerLogQueue)
{
this.userLogQueue = userLogQueue;
this.statusBarQueue = statusBarQueue;
this.developerLogQueue = developerLogQueue;
}
- public void append(LoggingEvent event)
+ public void doAppend(PaxLoggingEvent event)
{
- for (Filter filter = getFirstFilter();
- filter != null;
- filter = filter.getNext())
- {
- final int result = filter.decide(event);
- if (result == Filter.ACCEPT)
- break;
- else if (result == Filter.DENY)
- return;
- }
-
- if ( event.getLevel().equals(Level.INFO) ||
- event.getLevel().equals(Level.WARN))
- {
+ System.out.println(String.format("PaxLoggingEvent (%d - %s):
%s", event.getLevel().toInt(), event.getLevel().toString(),
event.getMessage()));
+ //if ( event.getLevel().equals(Level.INFO) ||
+ //event.getLevel().equals(Level.WARN))
+ //{
userLogQueue.offer(event);
statusBarQueue.offer(event);
- }
+ //}
developerLogQueue.offer(event);
}
-
- public boolean requiresLayout()
- {
- return false;
- }
-
- public void close()
- {
- userLogQueue.offer(NULL_EVENT);
- statusBarQueue.offer(NULL_EVENT);
- developerLogQueue.offer(NULL_EVENT);
- }
}
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueProcesser.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueProcesser.java
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/QueueProcesser.java
2009-08-11 16:38:11 UTC (rev 17769)
@@ -1,18 +1,18 @@
package org.cytoscape.log.internal;
import java.util.concurrent.BlockingQueue;
-import org.apache.log4j.spi.LoggingEvent;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
* @author Pasteur
*/
abstract class QueueProcesser implements Runnable
{
- public abstract void processEvent(LoggingEvent event);
+ public abstract void processEvent(PaxLoggingEvent event);
- final BlockingQueue<LoggingEvent> queue;
+ final BlockingQueue<PaxLoggingEvent> queue;
- public QueueProcesser(BlockingQueue<LoggingEvent> queue)
+ public QueueProcesser(BlockingQueue<PaxLoggingEvent> queue)
{
this.queue = queue;
}
@@ -21,7 +21,7 @@
{
while (true)
{
- LoggingEvent event = null;
+ PaxLoggingEvent event = null;
try
{
event = queue.take();
@@ -30,10 +30,6 @@
{
break;
}
-
- if (event.equals(QueueAppender.NULL_EVENT))
- break;
-
processEvent(event);
}
}
Modified:
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarUpdater.java
===================================================================
---
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarUpdater.java
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/java/org/cytoscape/log/internal/StatusBarUpdater.java
2009-08-11 16:38:11 UTC (rev 17769)
@@ -1,8 +1,7 @@
package org.cytoscape.log.internal;
import org.cytoscape.log.statusbar.CytoStatusBar;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.Level;
+import org.ops4j.pax.logging.spi.PaxLoggingEvent;
import java.util.Map;
import java.util.TreeMap;
@@ -15,14 +14,14 @@
final CytoStatusBar statusBar;
final Map config;
- public StatusBarUpdater(CytoStatusBar statusBar,
BlockingQueue<LoggingEvent> queue, Map config)
+ public StatusBarUpdater(CytoStatusBar statusBar,
BlockingQueue<PaxLoggingEvent> queue, Map config)
{
super(queue);
this.statusBar = statusBar;
this.config = config;
}
- public void processEvent(LoggingEvent event)
+ public void processEvent(PaxLoggingEvent event)
{
String message = event.getMessage().toString();
String iconPath =
config.get(event.getLevel().toString()).toString();
@@ -32,7 +31,7 @@
public static StatusBarUpdater executeStatusBarUpdater( ExecutorService
service,
CytoStatusBar
statusBar,
-
BlockingQueue<LoggingEvent> queue,
+
BlockingQueue<PaxLoggingEvent> queue,
Map config)
{
StatusBarUpdater updater = new StatusBarUpdater(statusBar,
queue, config);
Modified:
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-11 02:58:59 UTC (rev 17768)
+++
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2009-08-11 16:38:11 UTC (rev 17769)
@@ -4,6 +4,13 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
+
+ <osgi:service id="rootAppenderService" ref="rootAppender"
interface="org.ops4j.pax.logging.spi.PaxAppender">
+ <osgi:service-properties>
+ <entry key="org.ops4j.pax.logging.appender.name"
value="org.cytoscape.log-swing.main-appender"/>
+ </osgi:service-properties>
+ </osgi:service>
+
<osgi:service id="consoleTaskFactoryService" ref="consoleTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
Modified:
core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-11 02:58:59 UTC (rev 17768)
+++ core3/log-swing/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2009-08-11 16:38:11 UTC (rev 17769)
@@ -81,10 +81,6 @@
<constructor-arg ref="advancedQueue" />
</bean>
- <bean id="log4jInitialization"
class="org.cytoscape.log.internal.Log4jInit">
- <constructor-arg ref="rootAppender" />
- </bean>
-
<bean id="statusBarUpdater"
class="org.cytoscape.log.internal.StatusBarUpdater"
factory-method="executeStatusBarUpdater">
<constructor-arg ref="executorService" />
<constructor-arg ref="cytoStatusBarRef" />
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en
-~----------~----~----~----~------~----~------~--~---
