From 22bb472e292ed5f7dd4ba7cdc8da5e9ab62fc0b7 Mon Sep 17 00:00:00 2001
From: Gelin Luo <greenlaw110@gmail.com>
Date: Sun, 27 Jan 2019 21:41:53 +1100
Subject: [PATCH] It generates two logback.xml files in project #5

---
 CHANGELOG.md                                  |   4 +
 maven-archetype-quickstart/pom.xml            |   2 +-
 .../pom.xml                                   |   2 +-
 .../src/main/resources/logback.xml            | 115 ------------------
 pom.xml                                       |   6 +-
 .../META-INF/maven/archetype-metadata.xml     |   1 -
 .../src/main/resources/logback.xml            |  40 ------
 7 files changed, 9 insertions(+), 161 deletions(-)
 delete mode 100644 maven-archetype-simple-restful-service/src/main/resources/archetype-resources/src/main/resources/logback.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4235178..82f6148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Act Maven Archetypes Project
 
+**1.8.18.0**
+* update starter to 1.8.18.0
+* It generates two logback.xml files in project #5
+
 **1.8.17.1** - 24/Dec/2018
 * update starter to 1.8.17.1
 
diff --git a/maven-archetype-quickstart/pom.xml b/maven-archetype-quickstart/pom.xml
index 1739a86..d26244c 100644
--- a/maven-archetype-quickstart/pom.xml
+++ b/maven-archetype-quickstart/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>act-maven-archetypes</artifactId>
-    <version>1.8.17.2-SNAPSHOT</version>
+    <version>1.8.18.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/maven-archetype-simple-restful-service/pom.xml b/maven-archetype-simple-restful-service/pom.xml
index 12932ec..ec6c5b9 100644
--- a/maven-archetype-simple-restful-service/pom.xml
+++ b/maven-archetype-simple-restful-service/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>act-maven-archetypes</artifactId>
-    <version>1.8.17.2-SNAPSHOT</version>
+    <version>1.8.18.0-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/maven-archetype-simple-restful-service/src/main/resources/archetype-resources/src/main/resources/logback.xml b/maven-archetype-simple-restful-service/src/main/resources/archetype-resources/src/main/resources/logback.xml
deleted file mode 100644
index ba406ef..0000000
--- a/maven-archetype-simple-restful-service/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-  <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
-  <!-- Send debug messages to System.out -->
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- By default, encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-    <withJansi>true</withJansi>
-    <encoder>
-      <pattern>%date %highlight(%-5level) %cyan(%logger{5}@[%-4.30thread]) - %msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <!-- Console output for act-test test log -->
-  <appender name="TEST_STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <!-- By default, encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
-    <withJansi>true</withJansi>
-    <encoder>
-      <pattern>%msg%n</pattern>
-    </encoder>
-  </appender>
-
-  <!-- main log file -->
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>act.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </encoder>
-
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>/act.%i.log.zip</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>2MB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-  <!-- act-test test log file -->
-  <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>test.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%msg%n</Pattern>
-    </encoder>
-  </appender>
-
-  <appender name="DB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>act-db.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </encoder>
-
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>/act-db.%i.log.zip</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>2MB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-  <appender name="METRIC_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>act-metric.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
-    </encoder>
-
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>/act-metric.%i.log.zip</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>2MB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-  <logger name="act" level="INFO" additivity="false">
-    <appender-ref ref="FILE" />
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <logger name="act.mail" level="DEBUG" additivity="false">
-    <appender-ref ref="STDOUT"/>
-  </logger>
-
-  <logger name="act.db" level="INFO" additivity="false">
-    <appender-ref ref="DB_FILE" />
-  </logger>
-
-  <logger name="act.test" level="INFO" additivity="false">
-    <appender-ref ref="TEST_STDOUT"/>
-    <appender-ref ref="TEST_FILE"/>
-  </logger>
-
-  <logger name="act.metric" level="TRACE">
-    <appender-ref ref="METRIC_FILE" />
-  </logger>
-
-  <logger name="$package" level="DEBUG" additivity="false">
-    <appender-ref ref="FILE" />
-    <appender-ref ref="STDOUT" />
-  </logger>
-
-  <!-- By default, the level of the root level is set to INFO -->
-  <root level="INFO">
-    <appender-ref ref="STDOUT" />
-  </root>
-</configuration>
diff --git a/pom.xml b/pom.xml
index a92bae6..7703ae5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
   <artifactId>act-maven-archetypes</artifactId>
   <packaging>pom</packaging>
-  <version>1.8.17.2-SNAPSHOT</version>
+  <version>1.8.18.0-SNAPSHOT</version>
 
   <name>ActFramework Maven Archetypes Project</name>
   <description>A set of maven archetypes for actframework application</description>
@@ -29,14 +29,14 @@
   <parent>
     <groupId>org.actframework</groupId>
     <artifactId>parent</artifactId>
-    <version>1.8.17</version>
+    <version>1.8.18-SNAPSHOT</version>
   </parent>
 
   <properties>
     <java.version>1.7</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
-    <act-starter-parent.version>1.8.17.1</act-starter-parent.version>
+    <act-starter-parent.version>1.8.18.0-SNAPSHOT</act-starter-parent.version>
     <scm.url>git@github.com:actframework/act-maven-archetypes.git</scm.url>
     <maven-dependency-plugin.version>3.0.2</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 5670579..79d2398 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -29,7 +29,6 @@
       <directory>src/main/resources</directory>
       <includes>
         <include>**/*.version</include>
-        <include>logback.xml</include>
       </includes>
     </fileSet>
     <fileSet encoding="UTF-8" packaged="true">
diff --git a/src/main/resources/archetype-resources/src/main/resources/logback.xml b/src/main/resources/archetype-resources/src/main/resources/logback.xml
index 7ff9800..ba406ef 100644
--- a/src/main/resources/archetype-resources/src/main/resources/logback.xml
+++ b/src/main/resources/archetype-resources/src/main/resources/logback.xml
@@ -39,38 +39,6 @@
     </triggeringPolicy>
   </appender>
 
-  <!-- action trace log file -->
-  <appender name="TRACE_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>act-trace.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</Pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>/act-trace.%i.log.zip</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>2MB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-
-  <!-- request trace log file -->
-  <appender name="ACCESS_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>act-access.log</file>
-    <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-      <Pattern>%d{yyyy-MM-dd_HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</Pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <FileNamePattern>/act-access.%i.log.zip</FileNamePattern>
-      <MinIndex>1</MinIndex>
-      <MaxIndex>10</MaxIndex>
-    </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>2MB</MaxFileSize>
-    </triggeringPolicy>
-  </appender>
-
   <!-- act-test test log file -->
   <appender name="TEST_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>test.log</file>
@@ -126,14 +94,6 @@
     <appender-ref ref="DB_FILE" />
   </logger>
 
-  <logger name="act.trace.handler" level="TRACE" additivity="true">
-    <appender-ref ref="TRACE_FILE" />
-  </logger>
-
-  <logger name="act.trace.request" level="TRACE" additivity="true">
-    <appender-ref ref="ACCESS_FILE" />
-  </logger>
-
   <logger name="act.test" level="INFO" additivity="false">
     <appender-ref ref="TEST_STDOUT"/>
     <appender-ref ref="TEST_FILE"/>