Merge pull request #552 from guusdk/OF-1095

OF-1095: Improve plugin (un)loading related logging

build/lib/dist/log4j.xml

@@ -65,6 +65,21 @@
 		</layout>
 	</appender>
 
+	<appender name="console" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.EnhancedPatternLayout">
+			<param name="ConversionPattern" value="%m%n%throwable{0}" />
+		</layout>
+		<filter class="org.apache.log4j.varia.LevelRangeFilter">
+			<param name="LevelMin" value="info" />
+			<param name="AcceptOnMatch" value="true" />
+		</filter>
+	</appender>
+
+	<!-- OF-1095: Uniform output of loading/unloading of plugins to std-out. -->
+	<logger name="org.jivesoftware.openfire.container.PluginManager">
+		<appender-ref ref="console"/>
+	</logger>
+
 	<!-- OF-506: Jetty INFO messages are generally not useful. Ignore them by default. -->
 	<logger name="org.eclipse.jetty">
 		<level value="warn" />

build/lib/versions.txt

@@ -58,7 +58,7 @@ junit.jar                           | 4.11
 hamcrest-core.jar                   | 1.3 (required by junit)                                      | new BSD licence
 jzlib.jar                           | 1.0.7                                                        | GPL
 libidn.jar                          | 1.15                                                         | GNU Lesser General Public License version 2.1 or later (http://www.gnu.org/licenses/licenses.html)
-log4j.jar                           | 1.2.15                                                       | Apache 2.0 (http://logging.apache.org/log4j/1.2/license.html)
+log4j.jar                           | 1.2.17                                                       | Apache 2.0 (http://logging.apache.org/log4j/1.2/license.html)
 mail.jar                            | 1.4.1 (JavaMail)                                             |
 mina-core.jar                       | Apache Mina 2.0.7                                            | Apache 2.0
 mina-filter-compression.jar         | Apache Mina 2.0.7                                            | Apache 2.0

src/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java

@@ -323,7 +323,7 @@ public class AdminConsolePlugin implements Plugin {
             adminServer.start();
         }
         catch (Exception e) {
-            Log.error(e.getMessage(), e);
+            Log.error("An exception occurred while restarting the admin console:", e);
         }
     }
 

src/plugins/bookmarks/src/java/org/igniterealtime/openfire/plugin/BookmarksPlugin.java

@@ -30,8 +30,6 @@ public class BookmarksPlugin implements Plugin
 
     public void initializePlugin( PluginManager manager, File pluginDirectory )
     {
-        System.out.println( "Starting Bookmarks Plugin" );
-
         boolean foundIncompatiblePlugin = false;
         try
         {

src/plugins/clientControl/src/java/org/jivesoftware/openfire/plugin/ClientControlPlugin.java

@@ -48,8 +48,6 @@ public class ClientControlPlugin implements Plugin {
     // Plugin Interface
 
     public void initializePlugin(PluginManager manager, File pluginDirectory) {
-        System.out.println("Starting Client Control Plugin");
-
         // Check if we Enterprise is installed and stop loading this plugin if found
         File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");
         File[] jars = pluginDir.listFiles(new FileFilter() {

src/plugins/clustering/src/java/com/jivesoftware/openfire/ClusteringPlugin.java

@@ -44,8 +44,6 @@ public class ClusteringPlugin implements Plugin {
     private static final String COHERENCE_CACHE_CONFIG = "coherence-cache-config";
 
     public void initializePlugin(PluginManager manager, File pluginDirectory) {
-        System.out.println("Starting Clustering Plugin");
-
         // Check if we Enterprise is installed and stop loading this plugin if found
         File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");
         File[] jars = pluginDir.listFiles(new FileFilter() {

src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/FastpathPlugin.java

@@ -54,8 +54,6 @@ public class FastpathPlugin implements Plugin, ClusterEventListener {
     private WorkgroupManager workgroupManager;
 
     public void initializePlugin(PluginManager manager, File pluginDirectory) {
-        System.out.println("Starting Fastpath Server");
-
         // Check if we Enterprise is installed and stop loading this plugin if found
         File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");
         File[] jars = pluginDir.listFiles(new FileFilter() {

src/plugins/gojara/src/java/org/jivesoftware/openfire/plugin/gojara/base/RemoteRosterPlugin.java

@@ -54,7 +54,6 @@ public class RemoteRosterPlugin implements Plugin {
 	private GojaraAdminManager gojaraAdminManager = GojaraAdminManager.getInstance();
 	
 	public void initializePlugin(PluginManager manager, File pluginDirectory) {
-		Log.info("Starting RemoteRoster Plugin");
 		pluginManager = manager;
 		iManager.addInterceptor(mainInterceptor);
 		manageExternalComponents();
@@ -125,7 +124,6 @@ public class RemoteRosterPlugin implements Plugin {
 	}
 
 	public void destroyPlugin() {
-		Log.info("Destroying GoJara");
 		mainInterceptor.freeze();
 		iManager.removeInterceptor(mainInterceptor);
 		PropertyEventDispatcher.removeListener(_settingsObserver);

src/plugins/hazelcast/src/java/org/jivesoftware/openfire/plugin/HazelcastPlugin.java

@@ -56,8 +56,6 @@ public class HazelcastPlugin extends TimerTask implements Plugin {
 
 	@Override
 	public void run() {
-        System.out.println("Starting Hazelcast Clustering Plugin");
-
         // Check if another cluster is installed and stop loading this plugin if found
         File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");
         File[] jars = pluginDir.listFiles(new FileFilter() {

src/plugins/monitoring/src/java/org/jivesoftware/openfire/plugin/MonitoringPlugin.java

@@ -162,8 +162,6 @@ public class MonitoringPlugin implements Plugin {
 		xep0313Support = new Xep0313Support(XMPPServer.getInstance());
 		xep0313Support.start();
 
-		System.out.println("Starting Monitoring Plugin");
-
 		// Check if we Enterprise is installed and stop loading this plugin if
 		// found
 		File pluginDir = new File(JiveGlobals.getHomeDirectory(), "plugins");

src/plugins/packetFilter/src/java/org/jivesoftware/openfire/plugin/PacketFilterPlugin.java

@@ -40,7 +40,6 @@ public class PacketFilterPlugin implements Plugin, PacketInterceptor, PropertyEv
 
 	public void initializePlugin(PluginManager manager, File pluginDirectory) {
 		// register with interceptor manager
-		Log.info("Packet Filter loaded...");
 		interceptorManager.addInterceptor(this);
 		pluginManager = manager;
 		pf = PacketFilter.getInstance();