diff --git a/templates/springtrader/conf/catalina-fragment.properties b/templates/springtrader/conf/catalina-fragment.properties index fc5a1c4e..1c3b29c3 100644 --- a/templates/springtrader/conf/catalina-fragment.properties +++ b/templates/springtrader/conf/catalina-fragment.properties @@ -1 +1 @@ -spring.profiles.active=${nanotrader.spring.profiles.active} +spring.profiles.active=${springtrader.spring.profiles.active} diff --git a/templates/springtrader/conf/server-fragment.xml b/templates/springtrader/conf/server-fragment.xml index 6a29d8f5..266fd978 100644 --- a/templates/springtrader/conf/server-fragment.xml +++ b/templates/springtrader/conf/server-fragment.xml @@ -2,7 +2,7 @@ + validationQuery="${springtrader.validationQuery}"/> diff --git a/templates/springtrader/postgres.properties b/templates/springtrader/postgres.properties index 8b092124..7fef10ae 100644 --- a/templates/springtrader/postgres.properties +++ b/templates/springtrader/postgres.properties @@ -1,6 +1,6 @@ -nanotrader.nanotrader.driverClassName=org.postgresql.Driver -nanotrader.nanotrader.url=jdbc:postgresql://nanodbserver:5432/nanotrader -nanotrader.nanotrader.username=nanotrader -nanotrader.nanotrader.password=nanotrader -nanotrader.nanotrader.validationQuery=select version(); -nanotrader.nanotrader.spring.profiles.active=production,jndiPostgresql +springtrader.springtrader.driverClassName=org.postgresql.Driver +springtrader.springtrader.url=jdbc:postgresql://nanodbserver:5432/nanotrader +springtrader.springtrader.username=nanotrader +springtrader.springtrader.password=nanotrader +springtrader.springtrader.validationQuery=select version(); +springtrader.springtrader.spring.profiles.active=production,jndiPostgresql diff --git a/templates/springtrader/sqlfire.properties b/templates/springtrader/sqlfire.properties index c9c0db10..b6d3041a 100644 --- a/templates/springtrader/sqlfire.properties +++ b/templates/springtrader/sqlfire.properties @@ -1,6 +1,6 @@ -nanotrader.nanotrader.driverClassName=com.vmware.sqlfire.jdbc.ClientDriver -nanotrader.nanotrader.url=jdbc:sqlfire://nanodbserver:1527/ -nanotrader.nanotrader.username=nanotrader -nanotrader.nanotrader.password=nanotrader -nanotrader.nanotrader.validationQuery=select 1 from nanotrader.hibernate_sequences where sequence_name='ACCOUNT' -nanotrader.nanotrader.spring.profiles.active=production,jndi +springtrader.springtrader.driverClassName=com.vmware.sqlfire.jdbc.ClientDriver +springtrader.springtrader.url=jdbc:sqlfire://nanodbserver:1527/ +springtrader.springtrader.username=nanotrader +springtrader.springtrader.password=nanotrader +springtrader.springtrader.validationQuery=select 1 from nanotrader.hibernate_sequences where sequence_name='ACCOUNT' +springtrader.springtrader.spring.profiles.active=production,jndi