From 5077b9353eb6328c4ce1d6fa42aa2df92cadffc9 Mon Sep 17 00:00:00 2001
From: datagear <datagear@163.com>
Date: Mon, 22 Oct 2018 15:17:39 +0800
Subject: [PATCH] =?UTF-8?q?[web]=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=94=B1WEB-INF/confg=E6=94=B9=E4=B8=BAsrc/main/resources?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=AE=83?=
 =?UTF-8?q?=E4=BB=AC=E9=83=BD=E4=B8=8D=E6=98=AF=E7=94=A8=E6=88=B7=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datagear-web/pom.xml                          | 20 +++----------------
 .../resources/datagear-applicationContext.xml |  2 +-
 .../config => resources}/datagear.properties  |  0
 .../config => resources}/log4j.properties     |  2 +-
 datagear-web/src/main/webapp/WEB-INF/web.xml  |  2 +-
 5 files changed, 6 insertions(+), 20 deletions(-)
 rename datagear-web/src/main/{webapp/WEB-INF/config => resources}/datagear.properties (100%)
 rename datagear-web/src/main/{webapp/WEB-INF/config => resources}/log4j.properties (86%)

diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml
index dbdab0ac..a731a14a 100644
--- a/datagear-web/pom.xml
+++ b/datagear-web/pom.xml
@@ -14,7 +14,7 @@
 	<packaging>war</packaging>
 	
 	<properties>
-		<dist.log4j.rootLogger>DEBUG, A1</dist.log4j.rootLogger>
+		<dist.log4j.rootLogger>INFO, A1</dist.log4j.rootLogger>
 	</properties>
 	
 	<dependencies>
@@ -156,8 +156,7 @@
 			    <artifactId>maven-antrun-plugin</artifactId>
 			    <version>1.4</version>
 			    <executions>
-			    	
-			    	<!-- 打包前将log4j由DEBUG改为ERROR，打包后恢复为DEBUG -->
+			    	<!-- 打包前修改log4j的日志设置 -->
 			    	<execution>
 			    		<id>updateLog4jLevelToError</id>
 			    		<phase>prepare-package</phase>
@@ -166,24 +165,11 @@
 			    		</goals>
 			    		<configuration>
 			    			<tasks>
-			    				<replace file="src/main/webapp/WEB-INF/config/log4j.properties"
+			    				<replace file="${project.build.outputDirectory}/log4j.properties"
 			    					token="DEBUG, A0" value="${dist.log4j.rootLogger}" />
 			    			</tasks>
 			    		</configuration>
 			    	</execution>
-			    	<execution>
-			    		<id>resetLog4jLevelToDebug</id>
-			    		<phase>package</phase>
-			    		<goals>
-			    			<goal>run</goal>
-			    		</goals>
-			    		<configuration>
-			    			<tasks>
-			    				<replace file="src/main/webapp/WEB-INF/config/log4j.properties"
-			    					token="${dist.log4j.rootLogger}" value="DEBUG, A0" />
-			    			</tasks>
-			    		</configuration>
-			    	</execution>
 			    </executions>
 			</plugin>
 		</plugins>
diff --git a/datagear-web/src/main/resources/datagear-applicationContext.xml b/datagear-web/src/main/resources/datagear-applicationContext.xml
index 6adacfc6..878efd0c 100644
--- a/datagear-web/src/main/resources/datagear-applicationContext.xml
+++ b/datagear-web/src/main/resources/datagear-applicationContext.xml
@@ -15,7 +15,7 @@
     <bean id="propertyConfigurer"
     		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     	<property name="location">
-    		<value>/WEB-INF/config/datagear.properties</value>
+    		<value>classpath:datagear.properties</value>
     	</property>
     </bean>
     
diff --git a/datagear-web/src/main/webapp/WEB-INF/config/datagear.properties b/datagear-web/src/main/resources/datagear.properties
similarity index 100%
rename from datagear-web/src/main/webapp/WEB-INF/config/datagear.properties
rename to datagear-web/src/main/resources/datagear.properties
diff --git a/datagear-web/src/main/webapp/WEB-INF/config/log4j.properties b/datagear-web/src/main/resources/log4j.properties
similarity index 86%
rename from datagear-web/src/main/webapp/WEB-INF/config/log4j.properties
rename to datagear-web/src/main/resources/log4j.properties
index 0670169a..c850b1ee 100644
--- a/datagear-web/src/main/webapp/WEB-INF/config/log4j.properties
+++ b/datagear-web/src/main/resources/log4j.properties
@@ -10,7 +10,7 @@ log4j.appender.A0.layout.ConversionPattern=[%d{yyyy-MM-dd HH:mm:ss,SSS}] [%p] %-
 
 #==============appender 1==========================
 log4j.appender.A1=org.apache.log4j.RollingFileAppender
-log4j.appender.A1.File=logs/datagear.log
+log4j.appender.A1.File=logs/datagear/datagear.log
 log4j.appender.A1.MaxFileSize=5120KB
 log4j.appender.A1.MaxBackupIndex=20
 log4j.appender.A1.layout=org.apache.log4j.PatternLayout
diff --git a/datagear-web/src/main/webapp/WEB-INF/web.xml b/datagear-web/src/main/webapp/WEB-INF/web.xml
index 86bc8a18..b9b57ae7 100644
--- a/datagear-web/src/main/webapp/WEB-INF/web.xml
+++ b/datagear-web/src/main/webapp/WEB-INF/web.xml
@@ -13,7 +13,7 @@
 	</context-param>
 	<context-param>
 		<param-name>log4jConfigLocation</param-name>
-		<param-value>/WEB-INF/config/log4j.properties</param-value>
+		<param-value>classpath:log4j.properties</param-value>
 	</context-param>
 	<listener>
 		<listener-class>org.springframework.web.util.Log4jConfigListener