Make it possible to maven exec Scala API sample
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4b12bb4d Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4b12bb4d Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4b12bb4d Branch: refs/heads/master Commit: 4b12bb4d650196e906182e7f63ead1b3e368fd99 Parents: b6efaca Author: Mikael Ståldal <[email protected]> Authored: Fri Nov 4 16:05:31 2016 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Fri Nov 4 16:05:31 2016 +0100 ---------------------------------------------------------------------- .../scala/org/apache/logging/log4j/scala/LoggerMacro.scala | 4 ++-- log4j-samples/scala-api/pom.xml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4b12bb4d/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala ---------------------------------------------------------------------- diff --git a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala index a091c97..3b54db1 100644 --- a/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala +++ b/log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala @@ -346,7 +346,7 @@ private object LoggerMacro { def traceEntryParams(c: LoggerContext)(params: c.Expr[AnyRef]*): c.Expr[EntryMessage] = { import c.universe._ val isEnabled = Apply( - Select(Select(c.prefix.tree, newTermName("delegate")), newTermName("isEnabled")), + Select(Select(c.prefix.tree, TermName("delegate")), TermName("isEnabled")), List( reify(Level.TRACE).tree, reify(AbstractLogger.ENTRY_MARKER).tree, @@ -356,7 +356,7 @@ private object LoggerMacro { ) val log = Apply( - Select(Select(c.prefix.tree, newTermName("delegate")), newTermName("traceEntry")), + Select(Select(c.prefix.tree, TermName("delegate")), TermName("traceEntry")), reify(null: String).tree :: (params map (_.tree)).toList ) c.Expr[EntryMessage](If(isEnabled, log, reify(null).tree)) http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4b12bb4d/log4j-samples/scala-api/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-samples/scala-api/pom.xml b/log4j-samples/scala-api/pom.xml index 329531b..4bfea66 100644 --- a/log4j-samples/scala-api/pom.xml +++ b/log4j-samples/scala-api/pom.xml @@ -64,6 +64,14 @@ </configuration> </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.5.0</version> + <configuration> + <mainClass>org.apache.logging.log4j.scalasample.LoggingApp</mainClass> + </configuration> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin>
