Author: [email protected] Date: Mon Jun 4 16:15:31 2012 New Revision: 2435 Log: [AMDATUAUTH-163] Merged loghandler from 0.3.0 back to 0.2.3
Added: branches/amdatu-auth-0.2.3/config/src/main/resources/org.amdatu.auth.tools.loghandler.cfg branches/amdatu-auth-0.2.3/tools/loghandler/ branches/amdatu-auth-0.2.3/tools/loghandler/LICENSE branches/amdatu-auth-0.2.3/tools/loghandler/NOTICE branches/amdatu-auth-0.2.3/tools/loghandler/pom.xml branches/amdatu-auth-0.2.3/tools/loghandler/src/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/osgi/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/osgi/Activator.java branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java Modified: branches/amdatu-auth-0.2.3/pom.xml branches/amdatu-auth-0.2.3/release-demo/pom.xml branches/amdatu-auth-0.2.3/tools/pom.xml Added: branches/amdatu-auth-0.2.3/config/src/main/resources/org.amdatu.auth.tools.loghandler.cfg ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/config/src/main/resources/org.amdatu.auth.tools.loghandler.cfg Mon Jun 4 16:15:31 2012 @@ -0,0 +1,20 @@ +# Copyright (c) 2010, 2011 The Amdatu Foundation +# +# Licensed 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.verning permissions and limitations +# under the License. + +# This settings indicates the loglevels of messages that will be printed +# to the console. Can be DEBUG, INFO, WARNING or ERROR. For example if +# 'INFO' is defined, only log messages will be printed in the console which +# have a loglevel of INFO or higher (WARNING or ERROR). +console.mininum.loglevel=${amdatu.log.level} \ No newline at end of file Modified: branches/amdatu-auth-0.2.3/pom.xml ============================================================================== --- branches/amdatu-auth-0.2.3/pom.xml (original) +++ branches/amdatu-auth-0.2.3/pom.xml Mon Jun 4 16:15:31 2012 @@ -175,6 +175,13 @@ </dependency> <dependency> <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tools.loghandler</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + <type>bundle</type> + </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> <artifactId>org.amdatu.auth.tools.rest</artifactId> <version>${project.version}</version> <scope>compile</scope> Modified: branches/amdatu-auth-0.2.3/release-demo/pom.xml ============================================================================== --- branches/amdatu-auth-0.2.3/release-demo/pom.xml (original) +++ branches/amdatu-auth-0.2.3/release-demo/pom.xml Mon Jun 4 16:15:31 2012 @@ -104,13 +104,6 @@ </dependency> <dependency> <groupId>org.amdatu.core</groupId> - <artifactId>org.amdatu.core.loghandler</artifactId> - <version>${org.amdatu.core.version}</version> - <scope>runtime</scope> - <type>bundle</type> - </dependency> - <dependency> - <groupId>org.amdatu.core</groupId> <artifactId>org.amdatu.core.tenant</artifactId> <scope>runtime</scope> <type>bundle</type> @@ -424,6 +417,12 @@ <artifactId>org.amdatu.auth.tools.rest.doclet</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tools.loghandler</artifactId> + <scope>runtime</scope> + <type>bundle</type> + </dependency> <!-- Add the OpenSocial dependencies --> <dependency> Added: branches/amdatu-auth-0.2.3/tools/loghandler/LICENSE ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/LICENSE Mon Jun 4 16:15:31 2012 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. Added: branches/amdatu-auth-0.2.3/tools/loghandler/NOTICE ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/NOTICE Mon Jun 4 16:15:31 2012 @@ -0,0 +1,19 @@ +Amdatu Auth - Log handler +Copyright 2010, 2011 The Amdatu Foundation + +I. Included Software + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under the Apache License 2.0. + +II. Used Software + +This product uses software developed at +The OSGi Alliance (http://www.osgi.org/). +Copyright (c) OSGi Alliance (2000, 2007). +Licensed under the Apache License 2.0. + + +III. License Summary +- Apache License 2.0 Added: branches/amdatu-auth-0.2.3/tools/loghandler/pom.xml ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/pom.xml Mon Jun 4 16:15:31 2012 @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2010, 2011 The Amdatu Foundation + + Licensed 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.verning 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.amdatu.auth</groupId> + <artifactId>org.amdatu.auth.tools</artifactId> + <version>0.2.3-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.auth.tools.loghandler</artifactId> + <packaging>bundle</packaging> + <name>Amdatu Auth - Log Handler</name> + <description>The log handler provides several hooks to dispatch log entries from other logging frameworks (i.e. JDK logging) to the OSGi LogService</description> + + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Activator>org.amdatu.auth.tools.loghandler.osgi.Activator</Bundle-Activator> + <Bundle-SymbolicName>org.amdatu.auth.tools.loghandler</Bundle-SymbolicName> + <Embed-Dependency>*;scope=compile</Embed-Dependency> + <Embed-Transitive>true</Embed-Transitive> + <DynamicImport-Package> + javax.servlet, + org.apache.log, + org.apache.log4j, + org.apache.avalon.framework.logger + </DynamicImport-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <!-- Profile that will copy the jar to the configured amdatu.deploy.directory when + the deploy profile is activated --> + <id>deploy</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/osgi/Activator.java ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/osgi/Activator.java Mon Jun 4 16:15:31 2012 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2010-2012 The Amdatu Foundation + * + * Licensed 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.amdatu.auth.tools.loghandler.osgi; + +import org.amdatu.auth.tools.loghandler.service.ConsoleLogHandler; +import org.amdatu.auth.tools.loghandler.service.JdkLogForwarder; +import org.apache.felix.dm.DependencyActivatorBase; +import org.apache.felix.dm.DependencyManager; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; +import org.osgi.service.cm.ManagedService; +import org.osgi.service.log.LogListener; +import org.osgi.service.log.LogReaderService; +import org.osgi.service.log.LogService; + +/** + * This is the OSGi activator for this log handler bundle. + * + * @author <a href="mailto:[email protected]";>Amdatu Project Team</a> + */ +public class Activator extends DependencyActivatorBase { + + @Override + public void init(BundleContext context, DependencyManager manager) throws Exception { + // Register our console log handler + manager.add(createComponent() + .setInterface(new String[] {LogListener.class.getName(), ManagedService.class.getName()}, null) + .setImplementation(ConsoleLogHandler.class) + .add(createConfigurationDependency() + .setPid(ConsoleLogHandler.PID)) + .add(createServiceDependency() + .setService(LogReaderService.class) + .setRequired(false) + .setCallbacks("logReaderAdded", "logReaderRemoved")) + ); + + // Register the JDKLog bridge + manager.add(createComponent() + .setImplementation(JdkLogForwarder.class) + .add(createServiceDependency() + .setService(LogService.class) + .setRequired(true)) + .add(createServiceDependency() + .setService("(" + Constants.OBJECTCLASS + "=*)") + .setRequired(false) + .setCallbacks("onAdded", "onRemoved")) + ); + } + + @Override + public void destroy(BundleContext context, DependencyManager manager) throws Exception { + } +} Added: branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/ConsoleLogHandler.java Mon Jun 4 16:15:31 2012 @@ -0,0 +1,164 @@ +/* + * Copyright (c) 2010-2012 The Amdatu Foundation + * + * Licensed 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.amdatu.auth.tools.loghandler.service; + +import java.util.Calendar; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.Logger; + +import org.osgi.service.cm.ConfigurationException; +import org.osgi.service.cm.ManagedService; +import org.osgi.service.log.LogEntry; +import org.osgi.service.log.LogListener; +import org.osgi.service.log.LogReaderService; +import org.osgi.service.log.LogService; + +/** + * Handles log messages and prints them to the console. + * + * @author <a href="mailto:[email protected]";>Amdatu Project Team</a> + */ +public class ConsoleLogHandler implements LogListener, ManagedService { + private static int DEFAULT_LOG_LEVEL = LogService.LOG_DEBUG; + private int m_minLogLevel = DEFAULT_LOG_LEVEL; + + private static final Map<Integer, String> LOG_LEVELS; + static { + LOG_LEVELS = new HashMap<Integer, String>(); + LOG_LEVELS.put(LogService.LOG_DEBUG, "DEBUG"); + LOG_LEVELS.put(LogService.LOG_INFO, "INFO"); + LOG_LEVELS.put(LogService.LOG_WARNING, "WARNING"); + LOG_LEVELS.put(LogService.LOG_ERROR, "ERROR"); + } + + /** + * Name of the configuration PID for the loghandler config. + */ + public static final String PID = "org.amdatu.auth.tools.loghandler"; + + /** + * Name of the configuration property that determines the minimum log level + * of entries to print to the console. + */ + private static final String MIN_LOGLEVEL_KEY = "console.mininum.loglevel"; + + public void start() { + System.out.println("Console log handler started."); + } + + public void logReaderAdded(LogReaderService reader) { + reader.addLogListener(this); + } + + public void logReaderRemoved(LogReaderService reader) { + reader.removeLogListener(this); + } + + public void logged(LogEntry entry) { + if (entry.getLevel() <= m_minLogLevel) { + String symbName = entry.getBundle().getSymbolicName(); + String msg; + if (PID.equals(symbName)) { + // This is a log message logged by the JdkLogForwarder service from this bundle. + // In this case, do not append the origin bundle as this is already appended by + // the JdkLogForwarder. + msg = entry.getMessage(); + } + else { + msg = entry.getMessage() + " [" + symbName + "]"; + } + String levelName = LOG_LEVELS.get(entry.getLevel()); + System.out.println("[" + getTimestamp() + "] " + levelName + ": " + msg); + if (entry.getException() != null) { + System.out.println(entry.getException().getMessage()); + entry.getException().printStackTrace(); + } + } + } + + private String getTimestamp() { + Calendar cal = Calendar.getInstance(); + String timestamp = new Integer(cal.get(Calendar.YEAR)).toString(); // year + timestamp += "-" + toTwoDigits(cal.get(Calendar.MONTH) + 1); // month + timestamp += "-" + toTwoDigits(cal.get(Calendar.DAY_OF_MONTH)); // day + timestamp += " " + toTwoDigits(cal.get(Calendar.HOUR_OF_DAY)); // hour + timestamp += ":" + toTwoDigits(cal.get(Calendar.MINUTE)); // minutes + timestamp += ":" + toTwoDigits(cal.get(Calendar.SECOND)); // seconds + return timestamp; + } + + private String toTwoDigits(int dt) { + if (dt < 10) { + return "0" + new Integer(dt).toString(); + } + else { + return new Integer(dt).toString(); + } + } + + public void updated(Dictionary properties) throws ConfigurationException { + m_minLogLevel = getLogLevelFromProperties(properties); + Level jdkLevel = toJDKLevel(m_minLogLevel); + Enumeration<String> loggerNames = LogManager.getLogManager().getLoggerNames(); + while (loggerNames.hasMoreElements()) { + String loggerName = loggerNames.nextElement(); + Logger logger = LogManager.getLogManager().getLogger(loggerName); + if (logger != null) { + logger.setLevel(jdkLevel); + } + } + } + + private Level toJDKLevel(int osgiLevel) { + if (osgiLevel == LogService.LOG_DEBUG) { + return Level.ALL; + } + else if (osgiLevel == LogService.LOG_INFO) { + return Level.INFO; + } + else if (osgiLevel == LogService.LOG_WARNING) { + return Level.WARNING; + } + else { + return Level.SEVERE; + } + } + + private int getLogLevelFromProperties(Dictionary dictionary) { + if (dictionary == null) { + return DEFAULT_LOG_LEVEL; + } + + String minLogLevel = (String) dictionary.get(MIN_LOGLEVEL_KEY); + if (minLogLevel == null) { + return DEFAULT_LOG_LEVEL; + } + + for (Map.Entry<Integer, String> logLevelEntry : LOG_LEVELS.entrySet()) { + if (minLogLevel.equalsIgnoreCase(logLevelEntry.getValue())) { + return logLevelEntry.getKey(); + } + } + + // If we get here, there is no other way we can find the log level + return DEFAULT_LOG_LEVEL; + } +} Added: branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java ============================================================================== --- (empty file) +++ branches/amdatu-auth-0.2.3/tools/loghandler/src/main/java/org/amdatu/auth/tools/loghandler/service/JdkLogForwarder.java Mon Jun 4 16:15:31 2012 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2010-2012 The Amdatu Foundation + * + * Licensed 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.amdatu.auth.tools.loghandler.service; + +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogManager; +import java.util.logging.LogRecord; +import java.util.logging.Logger; + +import org.osgi.framework.ServiceReference; +import org.osgi.service.log.LogService; + +/** + * This class forwards JDK log messages to the OSGi log service. + * + * @author <a href="mailto:[email protected]";>Amdatu Project Team</a> + */ +public class JdkLogForwarder extends Handler { + + private static final Map<Level, Integer> LOG_LEVEL_MAPPING = new HashMap<Level, Integer>(); + static { + LOG_LEVEL_MAPPING.put(Level.SEVERE, LogService.LOG_ERROR); + LOG_LEVEL_MAPPING.put(Level.WARNING, LogService.LOG_WARNING); + LOG_LEVEL_MAPPING.put(Level.INFO, LogService.LOG_INFO); + LOG_LEVEL_MAPPING.put(Level.CONFIG, LogService.LOG_INFO); + } + + private volatile LogService m_log; + private final List<String> m_loggerNames; + + public JdkLogForwarder() { + m_loggerNames = new ArrayList<String>(); + } + + public synchronized void start() { + for (String loggerName : m_loggerNames) { + Logger logger = Logger.getLogger(loggerName); + logger.setUseParentHandlers(false); + logger.addHandler(this); + } + } + + public synchronized void stop() { + for (String loggerName : m_loggerNames) { + Logger.getLogger(loggerName).removeHandler(this); + } + } + + public synchronized void onAdded(ServiceReference ref, Object service) { + // We need to get all Java util logging loggers for this service + LogManager logManager = LogManager.getLogManager(); + Enumeration<String> loggerNames = logManager.getLoggerNames(); + while (loggerNames.hasMoreElements()) { + String loggerName = loggerNames.nextElement(); + if (!m_loggerNames.contains(loggerName)) { + m_loggerNames.add(loggerName); + Logger logger = logManager.getLogger(loggerName); + if (logger != null) { + logger.setUseParentHandlers(false); + + // Remove all current log handlers, it should be only me! + if (logger.getHandlers() != null) { + for (Handler logHandler : logger.getHandlers()) { + logger.removeHandler(logHandler); + } + } + + // Add me + logger.addHandler(this); + } + } + } + } + + public void onRemoved(ServiceReference ref, Object service) { + } + + @Override + public void publish(LogRecord record) { + if (record.getLevel() == Level.OFF) { + return; + } + String loggername = " [" + record.getLoggerName() + "]"; + if (record.getThrown() != null) { + m_log.log(getToOsgiLogLevel(record.getLevel()), + record.getMessage() + loggername, record.getThrown()); + } + else { + m_log + .log(getToOsgiLogLevel(record.getLevel()), record + .getMessage() + loggername); + } + } + + @Override + public void close() throws SecurityException { + } + + @Override + public void flush() { + } + + private int getToOsgiLogLevel(Level level) { + if (LOG_LEVEL_MAPPING.containsKey(level)) { + return LOG_LEVEL_MAPPING.get(level); + } + else { + return LogService.LOG_DEBUG; + } + } + +} Modified: branches/amdatu-auth-0.2.3/tools/pom.xml ============================================================================== --- branches/amdatu-auth-0.2.3/tools/pom.xml (original) +++ branches/amdatu-auth-0.2.3/tools/pom.xml Mon Jun 4 16:15:31 2012 @@ -30,6 +30,7 @@ <modules> <module>config</module> <module>itest</module> + <module>loghandler</module> <module>rest</module> <module>rest-doclet</module> </modules> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
