Merge branch 'master' of http://112.172.147.34:4936/style24/Servers.git

Conflicts:
	ldadmin.style24.com-config/context.xml

ldadmin.style24.com-config/context.xml

@@ -28,51 +28,9 @@
     -->
 
     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->
-    <Resource
-		auth="Container"
-		defaultAutoCommit="false"
-		description="STYLE24 DEV Database"
-		driverClassName="core.log.jdbc.driver.MysqlDriver"
-		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
-		initialSize="1"
-		maxActive="1"
-		maxIdle="1"
-		maxWait="10000"
-		minIdle="1"
-		name="jdbc/shopDs"
-		numTestsPerEvictionRun="5"
-		password="style01"
-		testWhileIdle="true"
-		type="javax.sql.DataSource"
-		url="jdbc:mysql://TSIT:3308/style?serverTimezone=Asia/Seoul#"
-		username="style"
-		validationInterval="60000"
-		validationQuery="SELECT 1 FROM DUAL"
-	/>
+    <Resource auth="Container" defaultAutoCommit="false" description="STYLE24 DEV Database" driverClassName="core.log.jdbc.driver.MysqlDriver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="1" maxActive="1" maxIdle="1" maxWait="10000" minIdle="1" name="jdbc/shopDs" numTestsPerEvictionRun="5" password="style01" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:mysql://TSIT:3308/style?serverTimezone=Asia/Seoul#" username="style" validationInterval="60000" validationQuery="SELECT 1 FROM DUAL"/>
 
     <!-- WMS DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.Mssql2005Driver"" 로 지정 -->
-    <Resource
-		 auth="Container"
-		 defaultAutoCommit="false"
-		 description="WMS DEV Database"
-		 driverClassName="core.log.jdbc.driver.Mssql2005Driver"
-		 factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
-		 initialSize="1"
-		 maxActive="1"
-		 maxIdle="1"
-		 maxWait="10000"
-		 minIdle="1"
-		 name="jdbc/wmsDs"
-		 numTestsPerEvictionRun="5"
-		 password="tester"
-		 testWhileIdle="true"
-		 type="javax.sql.DataSource"
-		 url="jdbc:sqlserver://TSIT:1433;database=test"
-		 username="tester"
-		 validationInterval="60000"
-		 validationQuery="SELECT 1"
-	/>
-	
-	
+    <Resource auth="Container" defaultAutoCommit="false" description="WMS DEV Database" driverClassName="core.log.jdbc.driver.Mssql2005Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="1" maxActive="1" maxIdle="1" maxWait="10000" minIdle="1" name="jdbc/wmsDs" numTestsPerEvictionRun="5" password="tester" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:sqlserver://TSIT:1433;database=test" username="tester" validationInterval="60000" validationQuery="SELECT 1"/>
     
 </Context>

ldbatch.style24.com-config/context.xml

@@ -31,6 +31,6 @@
     <Resource auth="Container" defaultAutoCommit="false" description="STYLE24 DEV Database" driverClassName="core.log.jdbc.driver.MysqlDriver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="1" maxActive="1" maxIdle="1" maxWait="10000" minIdle="1" name="jdbc/shopDs" numTestsPerEvictionRun="5" password="style01" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:mysql://TSIT:3308/style?serverTimezone=Asia/Seoul#" username="style" validationInterval="60000" validationQuery="SELECT 1 FROM DUAL"/>
 
 	<!-- WMS DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.Mssql2005Driver"" 로 지정 -->
-    <Resource auth="Container" defaultAutoCommit="false" description="WMS DEV Database" driverClassName="core.log.jdbc.driver.Mssql2005Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="1" maxActive="1" maxIdle="1" maxWait="10000" minIdle="1" name="jdbc/wmsDs" numTestsPerEvictionRun="5" password="tester" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:sqlserver://TSIT:1433;database=test" username="tester" validationInterval="60000" validationQuery="SELECT 1 FROM DUAL"/>
+    <Resource auth="Container" defaultAutoCommit="false" description="WMS DEV Database" driverClassName="core.log.jdbc.driver.Mssql2005Driver" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" initialSize="1" maxActive="1" maxIdle="1" maxWait="10000" minIdle="1" name="jdbc/wmsDs" numTestsPerEvictionRun="5" password="tester" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:sqlserver://TSIT:1433;database=test" username="tester" validationInterval="60000" validationQuery="SELECT 1"/>
 
 </Context>