|
|
@@ -27,21 +27,11 @@
|
|
|
<Manager pathname="" />
|
|
|
-->
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
<!-- 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="Tmxkdlf24^@^" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:mysql://TS-MYSQL:3310/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="Tmxkdlf24^@^" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:mysql://TSIT:3316/style?serverTimezone=Asia/Seoul#" username="style" validationInterval="60000" validationQuery="SELECT 1"/>
|
|
|
-=======
|
|
|
- <!-- 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="Tmxkdlf24^@^" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:mysql://TSIT:3316/style?serverTimezone=Asia/Seoul#" username="style" validationInterval="60000" validationQuery="SELECT 1 FROM DUAL"/>
|
|
|
->>>>>>> branch 'master' of http://112.172.147.34:4936/style24/Servers.git
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
<!-- 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="wms1234" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:sqlserver://TSIT:13341;database=iStyle24_Wms" username="iStyle24_Wms" validationInterval="60000" validationQuery="SELECT 1"/>
|
|
|
-
|
|
|
-=======
|
|
|
- <!-- 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="wms1234" testWhileIdle="true" type="javax.sql.DataSource" url="jdbc:sqlserver://TSIT:13341;database=iStyle24_Wms" username="iStyle24_Wms" validationInterval="60000" validationQuery="SELECT 1"/>
|
|
|
->>>>>>> branch 'master' of http://112.172.147.34:4936/style24/Servers.git
|
|
|
+
|
|
|
</Context>
|
gagamel