Merge branch 'master' of github.com:vFabric/springtrader

asargent · Oct 9, 2012 · 82b647b · 82b647b
2 parents 2636ee9 + 8184da0
commit 82b647b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git 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
@@ -2,7 +2,7 @@
 <Server>
     <GlobalNamingResources>
         <add:Resource auth="Container"
-                      driverClassName="${nanotrader.driverClassName}"
+                      driverClassName="${springtrader.driverClassName}"
                       initialSize="10"
                       jmxEnabled="true"
                       logAbandoned="true"
@@ -11,17 +11,17 @@
                       maxWait="-1"
                       minEvictableIdleTimeMillis="30000"
                       name="jdbc/nanodb"
-                      password="${nanotrader.password}"
+                      password="${springtrader.password}"
                       removeAbandoned="true"
                       removeAbandonedTimeout="60"
                       testOnBorrow="true"
                       testOnReturn="false"
                       testWhileIdle="true"
                       timeBetweenEvictionRunsMillis="5000"
                       type="javax.sql.DataSource"
-                      url="${nanotrader.url}"
-                      username="${nanotrader.username}"
+                      url="${springtrader.url}"
+                      username="${springtrader.username}"
                       validationInterval="30000"
-                      validationQuery="${nanotrader.validationQuery}"/>
+                      validationQuery="${springtrader.validationQuery}"/>
     </GlobalNamingResources>
 </Server>
diff --git 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
@@ -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