Startseite Erkunden Hilfe
Anmelden
style24
/
Servers
2
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

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

Conflicts:
	ldadmin.style24.com-config/context.xml
	ldbatch.style24.com-config/context.xml
	ldfront.style24.com-config/context.xml
	ldscm.style24.com-config/context.xml
gagamel vor 5 Jahren
Ursprung
f053b870dd f00d48dffa
Commit
894a5500f5
4 geänderte Dateien mit 28 neuen und 0 gelöschten Zeilen
Gesamtansicht Diff-Statistik anzeigen
  1. 10 0
      ldadmin.style24.com-config/context.xml
  2. 4 0
      ldbatch.style24.com-config/context.xml
  3. 7 0
      ldfront.style24.com-config/context.xml
  4. 7 0
      ldscm.style24.com-config/context.xml

+ 10 - 0
ldadmin.style24.com-config/context.xml
Datei anzeigen 

@@ -27,11 +27,21 @@
 
     <Manager pathname="" />
 
     <Manager pathname="" />
 
     -->
 
     -->
 
 
 
+<<<<<<< HEAD
 
     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

     <!-- 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://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"/>

     <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"" 로 지정 -->

     <!-- 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"/>

     <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>
 
 </Context>

+ 4 - 0
ldbatch.style24.com-config/context.xml
Datei anzeigen 

@@ -28,8 +28,12 @@
 
     -->
 
     -->
 
 
 
     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

+<<<<<<< HEAD
 
 <!--     <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://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"/>

     <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"/>

+=======
 
+    <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
 
 

 

 	<!-- WMS DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.Mssql2005Driver"" 로 지정 -->

 	<!-- 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"/>

     <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"/>

+ 7 - 0
ldfront.style24.com-config/context.xml
Datei anzeigen 

@@ -28,10 +28,17 @@
 
     -->
 
     -->
 
 
 
     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

+<<<<<<< HEAD
 
 <!--     <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://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"/>

     <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"/>

 

 

     <!-- WMS DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.Mssql2005Driver"" 로 지정 -->

     <!-- 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"/>

     <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"/>

     
     
+=======
 
+    <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"/>

+

+	<!-- 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>
 
 </Context>

+ 7 - 0
ldscm.style24.com-config/context.xml
Datei anzeigen 

@@ -28,7 +28,14 @@
 
     -->
 
     -->
 
 
 
     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

     <!-- STYLE24 DEV. 쿼리문 출력을 위해 driverClassName="core.log.jdbc.driver.MysqlDriver"" 로 지정 -->

+<<<<<<< HEAD
 
 <!--     <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://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"/>

     <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"/>

 
 
+=======
 
+    <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"/>

+

+	<!-- 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>
 
 </Context>