Merge pull request #203 from skyhit/fix_tokenization

fix tokenization problem

Author: skyhit

conf/direct-ds.xml

@@ -21,7 +21,7 @@
     <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
 	<xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
 	<xa-datasource-property name="DatabaseName">tcs_catalog</xa-datasource-property>
-	<xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property> 
+	<xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
     <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
     <!-- sql to call when connection is created -->
@@ -45,7 +45,7 @@
 
     <no-tx-datasource>
        <jndi-name>OLTP</jndi-name>
-        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=informixoltp_tcp</connection-url>
+        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/informixoltp:INFORMIXSERVER=@database.INFORMIXSERVER@</connection-url>
         <driver-class>com.informix.jdbc.IfxDriver</driver-class>
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -79,7 +79,7 @@
 
     <no-tx-datasource>
         <jndi-name>TCS_CATALOG</jndi-name>
-        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=informixoltp_tcp
+        <connection-url>jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:INFORMIXSERVER=@database.INFORMIXSERVER@
         </connection-url>
         <driver-class>com.informix.jdbc.IfxDriver</driver-class>
          <driver-class>com.informix.jdbc.IfxDriver</driver-class>
@@ -107,7 +107,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">informixoltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
 		<new-connection-sql>set lock mode to wait 5</new-connection-sql>
         <check-valid-connection-sql>select '1' from dual</check-valid-connection-sql>
@@ -167,7 +167,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -196,7 +196,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">corporate_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -226,7 +226,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">common_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
         <!-- sql to call when connection is created -->
         <new-connection-sql>set lock mode to wait 5</new-connection-sql>
@@ -258,7 +258,7 @@
         <xa-datasource-property name="IfxIFXHOST">@database.server@</xa-datasource-property>
         <xa-datasource-property name="PortNumber">@database.port@</xa-datasource-property>
         <xa-datasource-property name="DatabaseName">time_oltp</xa-datasource-property>
-        <xa-datasource-property name="ServerName">informixoltp_tcp</xa-datasource-property>
+        <xa-datasource-property name="ServerName">@database.INFORMIXSERVER@</xa-datasource-property>
 
 		<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
 		<!-- sql to call when connection is created -->

conf/token.properties

@@ -14,7 +14,7 @@ j#######################################################
 @database.port@=2021
 @database.username@=coder
 @database.password@=c0d3r4T
-@database.INFORMIXSERVER@=informixoltp_tcp
+    @database.INFORMIXSERVER@=informixoltp_tcp
 
 ###############################
 # bugs database configuration #
@@ -208,11 +208,6 @@ j#######################################################
 
 @ApplicationServer.DIRECT_API_SERVICE_ENDPOINT@= direct.dev.topcoder.com/direct/api/v2/
 
-###########################
-# Scorecard Configuration #
-###########################
-@scorecardUrl@=jdbc:informix-sqli://env.topcoder.com:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
-
 ##############################
 # CockpitUserPersistence.xml #
 ##############################

scorecard_tool/DataSource.groovy.properties

@@ -17,7 +17,7 @@ environments {
             // dbCreate = "create-drop"
 
             driverClassName = "com.informix.jdbc.IfxDriver"
-            url = "@scorecardUrl@"
+            url = "jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:[email protected]@;DB_LOCALE=en_us.utf8"
             username = "@database.username@"
             password = "@database.password@"
         }
@@ -33,7 +33,7 @@ environments {
     production {
         dataSource {
             driverClassName = "com.informix.jdbc.IfxDriver"
-            url = "@scorecardUrl@"
+            url = "jdbc:informix-sqli://@database.server@:@database.port@/tcs_catalog:[email protected]@;DB_LOCALE=en_us.utf8"
             username = "@database.username@"
             password = "@database.password@"
         }

token.properties.docker

@@ -36,10 +36,6 @@
 @dw.database.server@=direct-dev.topcoder.com
 @dw.database.INFORMIXSERVER@=datawarehouse_tcp
 
-###########################
-# Scorecard Configuration #
-###########################
-@scorecardUrl@=jdbc:informix-sqli://direct-dev.topcoder.com:2020/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
 
 #######################################
 ## Parameters used by EmailEngine.xml #

token.properties.example

@@ -56,14 +56,6 @@
 #@dw.database.server@=env.topcoder.com
 #@dw.database.INFORMIXSERVER@=informixoltp_tcp
 
-###########################
-# Scorecard Configuration #
-###########################
-# typical windows configuration
-@scorecardUrl@=jdbc:informix-sqli://localhost:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
-
-# typical VM configuration
-#@scorecardUrl@=jdbc:informix-sqli://env.topcoder.com:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;DB_LOCALE=en_us.utf8
 
 #######################################
 ## Parameters used by EmailEngine.xml #