Repository: wicket Updated Branches: refs/heads/wicket-6.x 520aea93b -> 1c2661a6b
WICKET-5671 Rename log4j.properties in the quickstart when creating a project for WildFly (cherry picked from commit 927ecae1b9446cefb8b69abafa686035c051a103) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1c2661a6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1c2661a6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1c2661a6 Branch: refs/heads/wicket-6.x Commit: 1c2661a6b775427e42dfa08fe3ff58ca10bbd2c9 Parents: 520aea9 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Mon Aug 11 21:52:02 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Mon Aug 11 21:52:36 2014 +0200 ---------------------------------------------------------------------- .../resources/META-INF/maven/archetype-metadata.xml | 11 ++++++++--- .../src/main/resources/__log4j.properties__ | 12 ++++++++++++ .../src/main/resources/log4j.properties | 12 ------------ 3 files changed, 20 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1c2661a6/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml index 3f4a221..9af8353 100644 --- a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <archetype-descriptor name="quickstart"> + <requiredProperties> + <requiredProperty key="log4j.properties"> + <defaultValue>log4j.properties</defaultValue> + </requiredProperty> + </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> <directory>src/main/java</directory> @@ -20,10 +25,10 @@ <include>**/*</include> </includes> </fileSet> - <fileSet filtered="true" packaged="false" encoding="UTF-8"> + <fileSet filtered="false" packaged="false" encoding="UTF-8"> <directory>src/main/resources</directory> <includes> - <include>**/*.properties</include> + <include>__log4j.properties__</include> </includes> </fileSet> <fileSet filtered="true" packaged="false" encoding="UTF-8"> @@ -40,4 +45,4 @@ </includes> </fileSet> </fileSets> -</archetype-descriptor> \ No newline at end of file +</archetype-descriptor> http://git-wip-us.apache.org/repos/asf/wicket/blob/1c2661a6/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ new file mode 100644 index 0000000..05cd58a --- /dev/null +++ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ @@ -0,0 +1,12 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n + +log4j.rootLogger=INFO,Stdout + +log4j.logger.org.apache.wicket=INFO +log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=INFO +log4j.logger.org.apache.wicket.version=INFO +log4j.logger.org.apache.wicket.RequestCycle=INFO + + http://git-wip-us.apache.org/repos/asf/wicket/blob/1c2661a6/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index 05cd58a..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.appender.Stdout=org.apache.log4j.ConsoleAppender -log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n - -log4j.rootLogger=INFO,Stdout - -log4j.logger.org.apache.wicket=INFO -log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=INFO -log4j.logger.org.apache.wicket.version=INFO -log4j.logger.org.apache.wicket.RequestCycle=INFO - -
