Repository: tomee Updated Branches: refs/heads/develop 0cfd86ee7 -> 857bcc445
fixing openjpa log setup for tomee embedded maven plugin - missing factory Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/857bcc44 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/857bcc44 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/857bcc44 Branch: refs/heads/develop Commit: 857bcc4456f8b6cfdfd005850ae6987a39f59e32 Parents: 0cfd86e Author: Romain Manni-Bucau <[email protected]> Authored: Mon Jan 26 10:57:38 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Jan 26 10:57:38 2015 +0100 ---------------------------------------------------------------------- .../maven/util/MavenLogStreamFactory.java | 2 +- .../apache/openejb/maven/util/OpenJPALog.java | 6 +++++ .../openejb/maven/util/OpenJPALogFactory.java | 27 ++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/857bcc44/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java ---------------------------------------------------------------------- diff --git a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java index c690f84..b2a9080 100644 --- a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java +++ b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/MavenLogStreamFactory.java @@ -36,7 +36,7 @@ public class MavenLogStreamFactory implements LogStreamFactory { 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"); + System.setProperty("openjpa.Log", "org.apache.openejb.maven.util.OpenJPALogFactory"); } } catch (final Exception ignored) { // no-op: openjpa is not at the classpath http://git-wip-us.apache.org/repos/asf/tomee/blob/857bcc44/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java ---------------------------------------------------------------------- diff --git a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java index 4a2cc2e..a6be523 100644 --- a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java +++ b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALog.java @@ -19,6 +19,12 @@ package org.apache.openejb.maven.util; import org.apache.openjpa.lib.log.Log; public class OpenJPALog implements Log { + private final String channel; + + public OpenJPALog(final String channel) { + this.channel = channel; // ignored for now + } + @Override public boolean isErrorEnabled() { return MavenLogStreamFactory.currentLogger().isErrorEnabled(); http://git-wip-us.apache.org/repos/asf/tomee/blob/857bcc44/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALogFactory.java ---------------------------------------------------------------------- diff --git a/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALogFactory.java b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALogFactory.java new file mode 100644 index 0000000..0715212 --- /dev/null +++ b/maven/maven-util/src/main/java/org/apache/openejb/maven/util/OpenJPALogFactory.java @@ -0,0 +1,27 @@ +/** + * 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; +import org.apache.openjpa.lib.log.LogFactory; + +public class OpenJPALogFactory implements LogFactory { + @Override + public Log getLog(final String channel) { + return new OpenJPALog(channel); + } +}
