QPID-2833: Add a Generic Actor for 0-10 Logging

Patch from SorinS <ssuciu@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1001536 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 88 insertions, 0 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/Main.java b/java/broker/src/main/java/org/apache/qpid/server/Main.java
index 452ddf5895..71cf17ed60 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -49,6 +49,7 @@ import org.apache.qpid.server.information.management.ServerInformationMBean;
 import org.apache.qpid.server.logging.SystemOutMessageLogger;
 import org.apache.qpid.server.logging.actors.BrokerActor;
 import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.logging.actors.GenericActor;
 import org.apache.qpid.server.logging.management.LoggingManagementMBean;
 import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.protocol.AMQProtocolEngineFactory;
@@ -309,6 +310,8 @@ public class Main
         // for the remainder of the startup, and the default actor if the stack is empty
         CurrentActor.set(new BrokerActor(config.getCompositeStartupMessageLogger()));
         CurrentActor.setDefault(new BrokerActor(config.getRootMessageLogger()));
+        GenericActor.setDefaultMessageLogger(config.getRootMessageLogger());
+        
 
         try
         {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
new file mode 100644
index 0000000000..09db81e7e5
--- /dev/null
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/actors/GenericActor.java
@@ -0,0 +1,85 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.qpid.server.logging.actors;
+
+import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.logging.LogSubject;
+import org.apache.qpid.server.logging.RootMessageLogger;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+
+public class GenericActor extends AbstractActor
+{
+
+    private static RootMessageLogger _defaultMessageLogger;
+
+    private LogSubject _logSubject;
+
+    public static RootMessageLogger getDefaultMessageLogger()
+    {
+        return _defaultMessageLogger;
+    }
+
+    public static void setDefaultMessageLogger(RootMessageLogger defaultMessageLogger)
+    {
+        _defaultMessageLogger = defaultMessageLogger;
+    }
+
+    public GenericActor(LogSubject logSubject, RootMessageLogger rootLogger)
+    {
+        super(rootLogger);
+        _logSubject = logSubject;
+    }
+
+    public String getLogMessage()
+    {
+        return _logSubject.toLogString();
+    }
+
+    public static LogActor getInstance(final String logMessage, RootMessageLogger rootLogger)
+    {
+        return new GenericActor(new LogSubject()
+        {
+            public String toLogString()
+            {
+                return logMessage;
+            }
+
+        }, rootLogger);
+    }
+
+    public static LogActor getInstance(final String subjectMessage)
+    {
+        return new GenericActor(new LogSubject()
+        {
+            public String toLogString()
+            {
+                return "[" + subjectMessage + "]";
+            }
+
+        }, _defaultMessageLogger);
+    }
+
+    public static LogActor getInstance(LogSubject logSubject)
+    {
+        return new GenericActor(logSubject, _defaultMessageLogger);
+    }
+}