Final update to log4g 2.x branch

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>

Sd1/P/Archetypes/mi-maven-archetype-quickstart/Makefile

 
 
 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

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">

Sd1/P/Archetypes/mi-maven-archetype-quickstart/src/main/resources/archetype-resources/src/main/java/App.java

 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.");
     }
 }

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