logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpo...@apache.org
Subject svn commit: r1479120 - in /logging/log4j/log4j2/trunk: ./ core/ core/src/main/java/org/apache/logging/log4j/core/jmx/ core/src/main/resources/META-INF/services/ jmx-gui/ jmx-gui/src/ jmx-gui/src/main/ jmx-gui/src/main/java/ jmx-gui/src/main/java/org/ j...
Date Sat, 04 May 2013 15:00:38 GMT
Author: rpopma
Date: Sat May  4 15:00:36 2013
New Revision: 1479120

URL: http://svn.apache.org/r1479120
Log:
LOG4J2-237: moved JMX client GUI classes into separate jmx-gui submodule

Added:
    logging/log4j/log4j2/trunk/jmx-gui/   (with props)
    logging/log4j/log4j2/trunk/jmx-gui/pom.xml   (with props)
    logging/log4j/log4j2/trunk/jmx-gui/src/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
      - copied, changed from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
      - copied, changed from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientEditConfigPanel.java
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
      - copied, changed from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
    logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUIJConsolePlugin.java
      - copied, changed from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUIJConsolePlugin.java
    logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/
    logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
      - copied, changed from r1479071, logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
    logging/log4j/log4j2/trunk/jmx-gui/src/site/
    logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml   (with props)
    logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/
    logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml   (with props)
    logging/log4j/log4j2/trunk/jmx-gui/src/test/
    logging/log4j/log4j2/trunk/jmx-gui/src/test/java/
    logging/log4j/log4j2/trunk/jmx-gui/src/test/resources/
Removed:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientEditConfigPanel.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUIJConsolePlugin.java
    logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
Modified:
    logging/log4j/log4j2/trunk/core/pom.xml
    logging/log4j/log4j2/trunk/pom.xml
    logging/log4j/log4j2/trunk/src/changes/changes.xml
    logging/log4j/log4j2/trunk/src/site/site.xml
    logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml

Modified: logging/log4j/log4j2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1479120&r1=1479119&r2=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/pom.xml (original)
+++ logging/log4j/log4j2/trunk/core/pom.xml Sat May  4 15:00:36 2013
@@ -354,57 +354,6 @@
         </plugins>
       </build>
     </profile>
-		<profile>
-			<id>default-profile</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-				<file>
-					<exists>${java.home}/../lib/jconsole.jar</exists>
-				</file>
-			</activation>
-			<properties>
-				<toolsjar>${java.home}/../lib/jconsole.jar</toolsjar>
-			</properties>
-
-			<dependencies>
-			    <!--
-				<dependency>
-					<groupId>com.sun</groupId>
-					<artifactId>tools</artifactId>
-					<version>1.6.0</version>
-					<scope>system</scope>
-					<systemPath>${toolsjar}</systemPath>
-				</dependency>
-				-->
-				<dependency>
-					<groupId>com.sun</groupId>
-					<artifactId>jconsole</artifactId>
-					<version>1.6.0</version>
-					<scope>system</scope>
-					<systemPath>${java.home}/../lib/jconsole.jar</systemPath>
-					<optional>true</optional>
-				</dependency>
-			</dependencies>
-		</profile>
-		<profile>
-			<id>mac-profile</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-				<file>
-					<exists>${java.home}/../Classes/jconsole.jar</exists>
-				</file>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>com.sun</groupId>
-					<artifactId>jconsole</artifactId>
-					<version>1.6.0</version>
-					<scope>system</scope>
-					<systemPath>${java.home}/../Classes/jconsole.jar</systemPath>
-					<optional>true</optional>
-				</dependency>
-			</dependencies>
-		</profile>
   </profiles>
 </project>
 

Propchange: logging/log4j/log4j2/trunk/jmx-gui/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat May  4 15:00:36 2013
@@ -0,0 +1 @@
+target

Added: logging/log4j/log4j2/trunk/jmx-gui/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/pom.xml?rev=1479120&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/pom.xml (added)
+++ logging/log4j/log4j2/trunk/jmx-gui/pom.xml Sat May  4 15:00:36 2013
@@ -0,0 +1,230 @@
+<!--
+ 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.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.logging.log4j</groupId>
+    <artifactId>log4j</artifactId>
+    <version>2.0-beta6-SNAPSHOT</version>
+    <relativePath>../</relativePath>
+  </parent>
+  <groupId>org.apache.logging.log4j</groupId>
+  <artifactId>log4j-jmx-gui</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Log4J JMX GUI</name>
+  <properties>
+    <log4jParentDir>${basedir}/..</log4jParentDir>
+    <docLabel>JMX GUI Documentation</docLabel>
+    <projectDir>/jmx-gui</projectDir>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+    </dependency>
+     <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-changes-plugin</artifactId>
+            <version>${changes.plugin.version}</version>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>changes-report</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+            <configuration>
+              <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.7</version>
+            <configuration>
+              <!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
+              <configLocation>${log4jParentDir}/checkstyle.xml</configLocation>
+              <suppressionsLocation>${log4jParentDir}/checkstyle-suppressions.xml</suppressionsLocation>
+              <enableRulesSummary>false</enableRulesSummary>
+              <propertyExpansion>basedir=${basedir}</propertyExpansion>
+              <propertyExpansion>licensedir=${log4jParentDir}/checkstyle-header.txt</propertyExpansion>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>${javadoc.plugin.version}</version>
+            <configuration>
+              <bottom> <![CDATA[<p align="center">Copyright &#169; {inceptionYear}-{currentYear}
{organizationName}. All Rights Reserved.<br />
+            Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache
Logging project logo,
+            and the Apache Log4j logo are trademarks of The Apache Software Foundation.</p>]]></bottom>
+              <!-- module link generation is completely broken in the javadoc plugin for
a multi-module non-aggregating
+                   project -->
+              <detectOfflineLinks>false</detectOfflineLinks>
+              <linksource>true</linksource>
+              <tags>
+                <tag>
+                  <name>issue</name>
+                  <placement>a</placement>
+                  <head>JIRA issue:</head>
+                </tag>
+                <tag>
+                  <name>doubt</name>
+                  <placement>a</placement>
+                  <head>Troublesome:</head>
+                </tag>
+                <tag>
+                  <name>compare</name>
+                  <placement>a</placement>
+                  <head>Compare with:</head>
+                </tag>
+              </tags>
+            </configuration>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <reports>
+                  <report>javadoc</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+            <version>2.3.2</version>
+            <configuration>
+              <threshold>Normal</threshold>
+              <effort>Default</effort>
+              <excludeFilterFile>findbugs-exclude-filter.xml</excludeFilterFile>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jxr-plugin</artifactId>
+            <version>2.3</version>
+            <reportSets>
+              <reportSet>
+                <id>non-aggregate</id>
+                <reports>
+                  <report>jxr</report>
+                </reports>
+              </reportSet>
+              <reportSet>
+                <id>aggregate</id>
+                <reports>
+                  <report>aggregate</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-pmd-plugin</artifactId>
+            <version>${pmd.plugin.version}</version>
+            <configuration>
+              <targetJdk>${maven.compile.target}</targetJdk>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>cobertura-maven-plugin</artifactId>
+            <version>2.2</version>
+            <reportSets>
+              <reportSet>
+                <!-- Disabled at it kills the site generation via a NoClassDefFoundError
-->
+                <reports />
+              </reportSet>
+            </reportSets>
+          </plugin>
+        </plugins>
+      </reporting>
+      <profiles>
+		<profile>
+			<id>default-profile</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<file>
+					<exists>${java.home}/../lib/jconsole.jar</exists>
+				</file>
+			</activation>
+			<properties>
+				<toolsjar>${java.home}/../lib/jconsole.jar</toolsjar>
+			</properties>
+
+			<dependencies>
+			    <!--
+				<dependency>
+					<groupId>com.sun</groupId>
+					<artifactId>tools</artifactId>
+					<version>1.6.0</version>
+					<scope>system</scope>
+					<systemPath>${toolsjar}</systemPath>
+				</dependency>
+				-->
+				<dependency>
+					<groupId>com.sun</groupId>
+					<artifactId>jconsole</artifactId>
+					<version>1.6.0</version>
+					<scope>system</scope>
+					<systemPath>${java.home}/../lib/jconsole.jar</systemPath>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>mac-profile</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<file>
+					<exists>${java.home}/../Classes/jconsole.jar</exists>
+				</file>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>com.sun</groupId>
+					<artifactId>jconsole</artifactId>
+					<version>1.6.0</version>
+					<scope>system</scope>
+					<systemPath>${java.home}/../Classes/jconsole.jar</systemPath>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+      </profiles>
+  <description>Swing-based client for remotely editing the log4j configuration and
remotely monitoring StatusLogger output. Includes a JConsole plug-in.</description>
+</project>
+

Propchange: logging/log4j/log4j2/trunk/jmx-gui/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
(from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java?p2=logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java&r1=1479071&r2=1479120&rev=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/Client.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
Sat May  4 15:00:36 2013
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.jmx;
+package org.apache.logging.log4j.jmx.gui;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,6 +28,9 @@ import javax.management.ObjectName;
 import javax.management.remote.JMXConnector;
 
 import org.apache.logging.log4j.core.helpers.Assert;
+import org.apache.logging.log4j.core.jmx.ContextSelectorAdminMBean;
+import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
+import org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean;
 
 /**
  * This class allows client-side code to perform operations on remote

Copied: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
(from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientEditConfigPanel.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java?p2=logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientEditConfigPanel.java&r1=1479071&r2=1479120&rev=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientEditConfigPanel.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientEditConfigPanel.java
Sat May  4 15:00:36 2013
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.jmx;
+package org.apache.logging.log4j.jmx.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -35,6 +35,8 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
+import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
+
 /**
  * Panel for editing Log4J configurations.
  */

Copied: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
(from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java?p2=logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java&r1=1479071&r2=1479120&rev=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUI.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUI.java
Sat May  4 15:00:36 2013
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.jmx;
+package org.apache.logging.log4j.jmx.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -45,6 +45,8 @@ import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 
 import org.apache.logging.log4j.core.helpers.Assert;
+import org.apache.logging.log4j.core.jmx.LoggerContextAdminMBean;
+import org.apache.logging.log4j.core.jmx.StatusLoggerAdminMBean;
 
 /**
  * GUI that connects to a Java process via JMX and allows the user to view and

Copied: logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUIJConsolePlugin.java
(from r1479071, logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUIJConsolePlugin.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUIJConsolePlugin.java?p2=logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUIJConsolePlugin.java&p1=logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUIJConsolePlugin.java&r1=1479071&r2=1479120&rev=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/jmx/ClientGUIJConsolePlugin.java
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/ClientGUIJConsolePlugin.java
Sat May  4 15:00:36 2013
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.jmx;
+package org.apache.logging.log4j.jmx.gui;
 
 import java.util.HashMap;
 import java.util.Map;

Copied: logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
(from r1479071, logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin?p2=logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin&p1=logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin&r1=1479071&r2=1479120&rev=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
(original)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/main/resources/META-INF/services/com.sun.tools.jconsole.JConsolePlugin
Sat May  4 15:00:36 2013
@@ -1 +1 @@
-org.apache.logging.log4j.core.jmx.ClientGUIJConsolePlugin
+org.apache.logging.log4j.jmx.gui.ClientGUIJConsolePlugin

Added: logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml?rev=1479120&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml (added)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml Sat May  4 15:00:36 2013
@@ -0,0 +1,49 @@
+<!--
+ 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.
+
+-->
+<project name="Component">
+  <body>
+    <links>
+      <item name="Apache" href="http://www.apache.org/" />
+      <item name="Logging Services" href="http://logging.apache.org/"/>
+      <item name="Log4j" href="../index.html"/>
+    </links>
+
+    <!-- Component-specific reports -->
+    <menu ref="reports"/>
+
+	<!-- Overall Project Info -->
+    <menu name="Log4J Project Information" img="icon-info-sign">
+      <item name="Dependencies" href="../dependencies.html" />
+      <item name="Dependency Convergence" href="../dependency-convergence.html" />
+      <item name="Dependency Management" href="../dependency-management.html" />
+      <item name="Project Team" href="../team-list.html" />
+      <item name="Mailing Lists" href="../mail-lists.html" />
+      <item name="Issue Tracking" href="../issue-tracking.html" />
+      <item name="Project License" href="../license.html" />
+      <item name="Source Repository" href="../source-repository.html" />
+      <item name="Project Summary" href="../project-summary.html" />
+    </menu>
+
+    <menu name="Log4J Project Reports" img="icon-cog">
+      <item name="Changes Report" href="../changes-report.html" />
+      <item name="JIRA Report" href="../jira-report.html" />
+      <item name="Surefire Report" href="../surefire-report.html" />
+      <item name="RAT Report" href="../rat-report.html" />
+    </menu>
+  </body>
+</project>

Propchange: logging/log4j/log4j2/trunk/jmx-gui/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml?rev=1479120&view=auto
==============================================================================
--- logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml (added)
+++ logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml Sat May  4 15:00:36 2013
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--
+    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.
+-->
+
+<document>
+    <properties>
+        <title>Log4J JMX GUI</title>
+        <author email="rpopma@apache.org">Remko Popma</author>
+    </properties>
+
+    <body>
+        <section name="Log4J JMX GUI">
+
+            <p>
+              JMX GUI provides a Swing-based client for remotely editing the log4j configuration

+              and remotely monitoring StatusLogger output. 
+            </p>
+            <p>The JMX GUI can be run as a stand-alone application or as a JConsole
plug-in.</p>
+
+        </section>
+
+        <section name="Requirements">
+           <p>
+             The JMX GUI requires at least Java 6 and is dependent on Log4j 2 Core.
+          </p>
+        </section>
+
+      <section name="Usage">
+        <p>
+          See the <a href="../manual/jmx.html#ClientGUI">JMX manual</a> page
for details.
+        </p>
+      </section>
+
+    </body>
+</document>
\ No newline at end of file

Propchange: logging/log4j/log4j2/trunk/jmx-gui/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: logging/log4j/log4j2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/pom.xml?rev=1479120&r1=1479119&r2=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/pom.xml (original)
+++ logging/log4j/log4j2/trunk/pom.xml Sat May  4 15:00:36 2013
@@ -601,6 +601,7 @@
     <module>flume-ng</module>
     <module>web</module>
     <module>taglib</module>
+    <module>jmx-gui</module>
     <module>samples</module>
   </modules>
   <profiles>

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1479120&r1=1479119&r2=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sat May  4 15:00:36 2013
@@ -23,6 +23,9 @@
 
   <body>
     <release version="2.0-beta6" date="@TBD@" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-237" dev="rpopma" type="update">
+        Moved JMX Client GUI classes into separate jmx-gui submodule.
+      </action>
       <action issue="LOG4J2-219" dev="rpopma" type="fix" due-to="Peter DePasquale">
         Fix: install default root logger if not configured (this is unchanged), 
         but make sure to include configured named loggers. Clarified documentation.

Modified: logging/log4j/log4j2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1479120&r1=1479119&r2=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/site.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/site.xml Sat May  4 15:00:36 2013
@@ -146,6 +146,7 @@
       <item name="Apache Flume" href="log4j-flume-ng/index.html"/>
       <item name="Log4j Web" href="log4j-web/index.html"/>
       <item name="Log4j Tag Library" href="log4j-taglib/index.html"/>
+      <item name="Log4j JMX GUI" href="log4j-jmx-gui/index.html"/>
     </menu>
 
     <menu name="Project Information" img="icon-info-sign">

Modified: logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml?rev=1479120&r1=1479119&r2=1479120&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml (original)
+++ logging/log4j/log4j2/trunk/src/site/xdoc/manual/jmx.xml Sat May  4 15:00:36 2013
@@ -83,7 +83,9 @@
 		<p>To run the Log4J JMX Client GUI as a JConsole Plug-in, 
 		start JConsole with the following command:
 		</p>
-		<p><code>$JAVA_HOME/bin/jconsole -pluginpath /path/to/log4j-core-2.0.jar</code></p>
+		<p><code>$JAVA_HOME/bin/jconsole -pluginpath /path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar</code></p>
+		<p>or on Windows:</p>
+		<p><code>%JAVA_HOME%\bin\jconsole -pluginpath \path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar</code></p>
 		<p>If you execute the above command and connect to your application,
 		you will see an extra "Log4j2" tab in the JConsole window.
 		This tab contains the client GUI, with the StatusLogger selected.
@@ -124,7 +126,9 @@
 		<p>To run the Log4J JMX Client GUI as a stand-alone application, 
 		run the following command:
 		</p>
-		<p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-core-2.0.jar org.apache.logging.log4j.core.jmx.ClientGUI
&lt;options&gt;</code></p>
+		<p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGUI &lt;options&gt;</code></p>
+		<p>or on Windows:</p>
+		<p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGUI &lt;options&gt;</code></p>
 		<p>Where <code>options</code> are one of the following:</p>
 		<ul>
 		<li><code>&lt;host&gt;:&lt;port&gt;</code></li>
@@ -145,7 +149,9 @@ com.sun.management.jmxremote.ssl=false</
         Monitoring and Management</a> provides details on how to configure
         JMX more securely with password authentication and SSL.)</b></p>
 		<p>Then you can run the client with this command:</p>
-		<p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-core-2.0.jar org.apache.logging.log4j.core.jmx.ClientGUI
localhost:33445</code></p>
+		<p><code>$JAVA_HOME/bin/java -cp /path/to/log4j-core-2.0.jar:/path/to/log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGUI localhost:33445</code></p>
+		<p>or on Windows:</p>
+		<p><code>%JAVA_HOME%\bin\java -cp \path\to\log4j-core-2.0.jar;\path\to\log4j-jmx-gui-2.0.jar
org.apache.logging.log4j.jmx.gui.ClientGUI localhost:33445</code></p>
 		<p>The screenshot below shows the StatusLogger panel of the client 
 		GUI when running as a stand-alone application.</p>
         <p><img src="../images/jmx-standalone-statuslogger.png" /></p>



Mime
View raw message