log4j Logger now local

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@87 09dcff7a-b715-0410-9601-b79a96267cd0

1 files changed, 10 insertions, 11 deletions

diff --git a/orktrack/src/net/sf/oreka/orktrack/Port.java b/orktrack/src/net/sf/oreka/orktrack/Port.java
index 0e8822e..4ebd1e3 100644
--- a/orktrack/src/net/sf/oreka/orktrack/Port.java
+++ b/orktrack/src/net/sf/oreka/orktrack/Port.java
@@ -41,11 +41,10 @@ public class Port {
 	private LinkedList<RecSegment> recSegments = new LinkedList<RecSegment> ();
 	private LinkedList<RecTape> recTapes = new LinkedList<RecTape> ();
 	
-	Logger log = null;
+	static Logger logger = Logger.getLogger(ProgramManager.class);
 	
 	public Port(RecPort recPort) {
 		this.recPort = recPort;
-		log = LogManager.getInstance().portLogger;
 	}
 	
 	private synchronized void addTapeToLocalCache(RecTape tape) {
@@ -101,7 +100,7 @@ public class Port {
 			RecTape tape = it.next();
 			if (areTogether(tape, segment)) {
 				joinTogether(tape, segment, hbnSession);
-				log.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
+				logger.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
 				foundOne = true;
 			}
 			else {
@@ -122,7 +121,7 @@ public class Port {
 			RecSegment segment = it.next();
 			if (areTogether(tape, segment)) {
 				joinTogether(tape, segment, hbnSession);
-				log.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
+				logger.info("#" + recPort.getId() + ": associating segment:" + segment.getId() + " with tape:" + tape.getId());
 				foundOne = true;
 			}
 			else {
@@ -177,10 +176,10 @@ public class Port {
 					addSegmentToLocalCache(recSegment);
 					findAndAssociateTape(recSegment, hbnSession);
 					hbnSession.save(recSegment);
-					log.info("#" + metadataMessage.getCapturePort() + ": written segment " + recSegment.getId());
+					logger.info("#" + metadataMessage.getCapturePort() + ": written segment " + recSegment.getId());
 				}
 				else {
-					log.info("#" + metadataMessage.getCapturePort() + ":  metadata message discarded");
+					logger.info("#" + metadataMessage.getCapturePort() + ":  metadata message discarded");
 				}
 			}
 		}
@@ -194,10 +193,10 @@ public class Port {
 		else {
 			// Tape stop
 			if (lastTapeMessage == null) {
-				log.warn("Port: notifyTapeMessage: stop without a previous tape message");
+				logger.warn("Port: notifyTapeMessage: stop without a previous tape message");
 			}
 			else if (lastTapeMessage.getStage() != TapeMessage.CaptureStage.START) {
-				log.warn("Port: notifyTapeMessage: stop without a start");	
+				logger.warn("Port: notifyTapeMessage: stop without a start");	
 			}
 			else if (tapeMessage.getStage() == TapeMessage.CaptureStage.STOP){
 				boolean generateSegment = false;
@@ -224,7 +223,7 @@ public class Port {
 				recTape.setTimestamp(timestamp);
 				recTape.setService(srv);
 				hbnSession.save(recTape);
-				log.info("#" + tapeMessage.getCapturePort() + ": written tape " + recTape.getId());
+				logger.info("#" + tapeMessage.getCapturePort() + ": written tape " + recTape.getId());
 				
 				if (generateSegment) {
 					RecSegment recSegment = new RecSegment();
@@ -243,10 +242,10 @@ public class Port {
 					}
 					if (ProgramManager.instance().filterSegmentAgainstAllPrograms(recSegment, hbnSession)) {
 						hbnSession.save(recSegment);
-						log.info("#" + tapeMessage.getCapturePort() + ": written segment " + recSegment.getId());
+						logger.info("#" + tapeMessage.getCapturePort() + ": written segment " + recSegment.getId());
 					}
 					else {
-						log.info("#" + tapeMessage.getCapturePort() + ":  tape message discarded");					}
+						logger.info("#" + tapeMessage.getCapturePort() + ":  tape message discarded");					}
 				}
 				else {
 					// segments are generated by metadata messages