From fca43352a573b7e5c7e7fb2ab4ff978370824734 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 2 Nov 2014 20:16:52 +0100
Subject: [PATCH] Final update to log4g 2.x branch
---
Sd1/P/Archetypes/catalog.xml | 8 -------
.../mi-maven-archetype-quickstart/Makefile | 3 ++-
.../META-INF/maven/archetype-metadata.xml | 2 +-
.../src/main/java/App.java | 21 ++++++++++++-------
.../src/main/resources/log4j2.xml | 16 ++++----------
5 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/Sd1/P/Archetypes/catalog.xml b/Sd1/P/Archetypes/catalog.xml
index f4bc85cf5..bd93e9430 100644
--- a/Sd1/P/Archetypes/catalog.xml
+++ b/Sd1/P/Archetypes/catalog.xml
@@ -5,14 +5,6 @@
http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd">
<archetypes>
- <archetype>
- <groupId>de.hdm-stuttgart.mi</groupId>
- <artifactId>mi-maven-archetype-quickstart</artifactId>
- <version>1.0</version>
- <repository>http://maven.mi.hdm-stuttgart.de/Archetypes</repository>
- <description>Modified from maven-archetype-quickstart using Java 1.8, log4j 1.2 and Junit 4.11</description>
- </archetype>
-
<archetype>
<groupId>de.hdm-stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-quickstart</artifactId>
diff --git a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/Makefile b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/Makefile
index 1e6de2b90..5ad058955 100644
--- a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/Makefile
+++ b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/Makefile
@@ -1,7 +1,8 @@
install:
- rsync -av --delete -e ssh ~/.m2/repository/de/hdm-stuttgart/mi/mi-maven-archetype-quickstart root@maven.mi.hdm-stuttgart.de:/var/www/Archetypes/de/hdm-stuttgart/mi
+ mvn clean install
+ rsync -av --delete -e ssh ~/.m2/repository/de/hdm-stuttgart/mi/mi-maven-archetype-quickstart root@maven.mi.hdm-stuttgart.de:/var/www/Archetypes/de/hdm-stuttgart/mi
clean:
rm -rf ~/.m2/repository/de/hdm-stuttgart/mi/mi-maven-archetype-quickstart
diff --git a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
index aaaec0dcf..8a2761f06 100644
--- a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,7 +12,7 @@
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
- <include>**/*.properties</include>
+ <include>**/*.xml</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
diff --git a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java
index bed77de27..4e090cbad 100644
--- a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java
+++ b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java
@@ -1,19 +1,26 @@
package $package;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
/**
- * Hello world!
- *
+ * A simple http://logging.apache.org/log4j/2.x demo,
+ * see file log4j2.xml for configuration options.
+ *
*/
public class App {
- private static Logger log = Logger.getLogger(App.class);
+ private static Logger log = LogManager.getLogger(App.class);
+ /**
+ * @param args Unused
+ */
public static void main( String[] args ) {
System.out.println( "Hello World!" );
- log.debug("With respect to logging you may want to configure file");
+
+ log.debug("With respect to logging you may want to configure file ");
log.debug("'src/main/resources/log4j2.xml' to suit your needs.");
- log.debug("Above config file 'log4j2.xml' will result in 'A1.log'" +
- "file creation containing similar logging output as well.");
+ log.debug("This config file 'log4j2.xml' will result in 'A1.log'" +
+ " file containing logging output as well.");
}
}
diff --git a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/log4j2.xml b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
index 0f54bb0a5..5df1c59a1 100644
--- a/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
+++ b/Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/resources/log4j2.xml
@@ -9,21 +9,13 @@
</Console>
</Appenders>
<Loggers>
- <Logger name="org.apache.log4j.xml" level="debug">
+
+ <!-- You my want to define class or package level per-logger rules -->
+ <Logger name="de.hdm_stuttgart.mi.sda2.qq.App" level="debug">
<AppenderRef ref="A1"/>
</Logger>
<Root level="debug">
<AppenderRef ref="STDOUT"/>
</Root>
</Loggers>
-</Configuration>
-
-
-<!--
- # Activate per-class or package logging rules if required. For example
-# reducing logging to INFO level for class ${groupId}.${artifactId}.App
-# can be achieved by un-commenting the following line:
-
-#log4j.logger.${groupId}.${artifactId}.App.parse.Group=INFO
-
- -->
\ No newline at end of file
+</Configuration>
\ No newline at end of file
--
GitLab