You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/06 23:40:38 UTC
svn commit: r634437 - in
/geronimo/server/trunk/framework/modules/geronimo-system/src:
main/java/org/apache/geronimo/system/logging/log4j/
test/java/org/apache/geronimo/system/logging/log4j/
Author: djencks
Date: Thu Mar 6 14:40:36 2008
New Revision: 634437
URL: http://svn.apache.org/viewvc?rev=634437&view=rev
Log:
GERONIMO-3898 gbean for app-specific log4j configuration
Added:
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java (with props)
geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java (with props)
Added: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java?rev=634437&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java Thu Mar 6 14:40:36 2008
@@ -0,0 +1,97 @@
+/*
+ * 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.geronimo.system.logging.log4j;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
+import org.apache.log4j.PropertyConfigurator;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ApplicationLog4jConfigurationGBean {
+
+ private static final String CATEGORY_PREFIX = "log4j.category.";
+ private static final String LOGGER_PREFIX = "log4j.logger.";
+ private static final String RENDERER_PREFIX = "log4j.renderer.";
+
+ public ApplicationLog4jConfigurationGBean(String log4jResource, String log4jFile, ServerInfo serverInfo, ClassLoader classloader) throws IOException {
+ InputStream in;
+ if (log4jFile != null) {
+ File file = serverInfo.resolveServer(log4jFile);
+ in = new FileInputStream(file);
+ } else if (log4jResource != null) {
+ in = classloader.getResourceAsStream(log4jResource);
+ if (in == null) {
+ throw new NullPointerException("No log4j properties resource found at " + log4jResource);
+ }
+ } else {
+ return;
+ }
+ Properties props = new Properties();
+ try {
+ props.load(in);
+ } finally {
+ in.close();
+ }
+ //remove any global log4j configuration
+ for (Iterator it = props.keySet().iterator(); it.hasNext(); ) {
+ String key = (String) it.next();
+ if (key.startsWith(CATEGORY_PREFIX)
+ || key.startsWith(LOGGER_PREFIX)
+ || key.startsWith(RENDERER_PREFIX)) {
+ continue;
+ }
+ it.remove();
+ }
+
+ PropertyConfigurator.configure(props);
+ }
+
+ public static final GBeanInfo GBEAN_INFO;
+
+ static {
+ GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ApplicationLog4jConfigurationGBean.class, "SystemLog");
+
+ infoFactory.addAttribute("log4jResource", String.class, true);
+ infoFactory.addAttribute("log4jFile", String.class, true);
+ infoFactory.addAttribute("classloader", ClassLoader.class, false);
+
+ infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
+
+ infoFactory.setConstructor(new String[]{"log4jResource", "log4jFile", "ServerInfo", "classloader"});
+
+ GBEAN_INFO = infoFactory.getBeanInfo();
+ }
+
+ public static GBeanInfo getGBeanInfo() {
+ return GBEAN_INFO;
+ }
+
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationGBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java?rev=634437&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java (added)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java Thu Mar 6 14:40:36 2008
@@ -0,0 +1,34 @@
+/*
+ * 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.geronimo.system.logging.log4j;
+
+import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanInfo;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class ApplicationLog4jConfigurationTest extends TestCase {
+
+ public void testGBeanInfo() throws Exception {
+ GBeanInfo info = ApplicationLog4jConfigurationGBean.getGBeanInfo();
+ }
+}
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/logging/log4j/ApplicationLog4jConfigurationTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain