diff --git a/Sd1/P/Archetypes/catalog.xml b/Sd1/P/Archetypes/catalog.xml index f4bc85cf50b2272bc40b1dee273993d0ec4ae574..bd93e94308fea93aaa68072c499fc29feaacd2e3 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 1e6de2b9003fb3fdf451720e74f66cee51cd76f5..5ad058955bb851b732048c37667b547153e05f47 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 aaaec0dcf07d1bd961be90e0586c20f925bbcf6d..8a2761f068fa37855a013d1e7ba652b58c153232 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 bed77de27317f5c721724242226e038b4ff243e9..4e090cbadc3c413275b7d804cc6a3d7e39c8e11b 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 0f54bb0a59c8db1d6b113737c26cbba7c6f931ab..5df1c59a1531f703177e4fa1861bcad9b5701b16 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