You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/10/09 22:04:01 UTC

svn commit: r1630580 - in /tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util: MavenLogStreamFactory.java OpenJPALog.java

Author: rmannibucau
Date: Thu Oct  9 20:04:00 2014
New Revision: 1630580

URL: http://svn.apache.org/r1630580
Log:
openjpa.log for maven

Added:
    tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java
Modified:
    tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java

Modified: tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java?rev=1630580&r1=1630579&r2=1630580&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java (original)
+++ tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java Thu Oct  9 20:04:00 2014
@@ -33,6 +33,15 @@ public class MavenLogStreamFactory imple
     private static Log logger;
     static {
         System.setProperty(WebBeansLoggerFacade.OPENWEBBEANS_LOGGING_FACTORY_PROP, OWBMavenLogFactory.class.getName());
+        try {
+            if (System.getProperty("openjpa.Log") == null) {
+                MavenLogStreamFactory.class.getClassLoader().loadClass("org.apache.openjpa.lib.log.LogFactoryAdapter");
+                System.setProperty("openjpa.Log", "org.apache.openejb.maven.util.OpenJPALog");
+            }
+        } catch (final Exception ignored) {
+            // no-op: openjpa is not at the classpath
+        }
+
     }
 
     @Override

Added: tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java?rev=1630580&view=auto
==============================================================================
--- tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java (added)
+++ tomee/tomee/trunk/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java Thu Oct  9 20:04:00 2014
@@ -0,0 +1,96 @@
+/**
+ * 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.openejb.maven.util;
+
+import org.apache.openjpa.lib.log.Log;
+
+public class OpenJPALog implements Log {
+    @Override
+    public boolean isErrorEnabled() {
+        return MavenLogStreamFactory.currentLogger().isErrorEnabled();
+    }
+
+    @Override
+    public boolean isFatalEnabled() {
+        return MavenLogStreamFactory.currentLogger().isErrorEnabled();
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return MavenLogStreamFactory.currentLogger().isInfoEnabled();
+    }
+
+    @Override
+    public boolean isTraceEnabled() {
+        return MavenLogStreamFactory.currentLogger().isDebugEnabled();
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return MavenLogStreamFactory.currentLogger().isWarnEnabled();
+    }
+
+    @Override
+    public void trace(final Object message) {
+        MavenLogStreamFactory.currentLogger().debug(String.valueOf(message));
+    }
+
+    @Override
+    public void trace(final Object message, final Throwable t) {
+        MavenLogStreamFactory.currentLogger().debug(String.valueOf(message), t);
+    }
+
+    @Override
+    public void info(final Object message) {
+        MavenLogStreamFactory.currentLogger().info(String.valueOf(message));
+    }
+
+    @Override
+    public void info(final Object message, final Throwable t) {
+        MavenLogStreamFactory.currentLogger().info(String.valueOf(message), t);
+    }
+
+    @Override
+    public void warn(final Object message) {
+        MavenLogStreamFactory.currentLogger().warn(String.valueOf(message));
+    }
+
+    @Override
+    public void warn(final Object message, final Throwable t) {
+        MavenLogStreamFactory.currentLogger().warn(String.valueOf(message), t);
+    }
+
+    @Override
+    public void error(final Object message) {
+        MavenLogStreamFactory.currentLogger().error(String.valueOf(message));
+    }
+
+    @Override
+    public void error(final Object message, final Throwable t) {
+        MavenLogStreamFactory.currentLogger().error(String.valueOf(message), t);
+    }
+
+    @Override
+    public void fatal(final Object message) {
+        MavenLogStreamFactory.currentLogger().error(String.valueOf(message));
+    }
+
+    @Override
+    public void fatal(final Object message, final Throwable t) {
+        MavenLogStreamFactory.currentLogger().error(String.valueOf(message), t);
+    }
+}