cleanup profiles and settings.
This commit is contained in:
@@ -65,19 +65,10 @@
|
||||
location="classpath*:/application.properties,
|
||||
classpath*:/application.test.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
<property name="url" value="${jdbc.url}" />
|
||||
<property name="username" value="${jdbc.username}" />
|
||||
<property name="password" value="${jdbc.password}" />
|
||||
</bean>
|
||||
|
||||
<!-- 初始化数据结构 -->
|
||||
<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
|
||||
<!-- 嵌入式内存中数据库 -->
|
||||
<jdbc:embedded-database id="dataSource" type="H2">
|
||||
<jdbc:script location="classpath:sql/h2/schema.sql" />
|
||||
</jdbc:initialize-database>
|
||||
</jdbc:embedded-database>
|
||||
|
||||
<!-- 初始化默认数据 -->
|
||||
<bean class="org.springside.modules.test.data.DataInitializer" lazy-init="false">
|
||||
@@ -93,9 +84,8 @@
|
||||
classpath*:/application.functional.properties,
|
||||
classpath*:/application.functional-local.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<!-- 简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
<property name="url" value="${jdbc.url}" />
|
||||
<property name="username" value="${jdbc.username}" />
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ public class BaseFunctionalTestCase {
|
||||
public static void beforeClass() throws Exception {
|
||||
baseUrl = propertiesLoader.getProperty("baseUrl", MiniServiceServer.BASE_URL);
|
||||
|
||||
Boolean isEmbedded = propertiesLoader.getBoolean("embedded", true);
|
||||
Boolean isEmbedded = new URL(baseUrl).getHost().equals("localhost");
|
||||
|
||||
if (isEmbedded) {
|
||||
startJettyOnce();
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
baseUrl=http://localhost:8084/mini-service
|
||||
embedded=true
|
||||
baseUrl=http://localhost:8084/mini-service
|
||||
@@ -1,9 +0,0 @@
|
||||
#h2 in-memory database settings
|
||||
jdbc.driver=org.h2.Driver
|
||||
jdbc.url=jdbc:h2:mem:mini-service4;DB_CLOSE_DELAY=-1
|
||||
jdbc.username=sa
|
||||
jdbc.password=
|
||||
|
||||
#log4jdbc driver
|
||||
#jdbc.driver=net.sf.log4jdbc.DriverSpy
|
||||
#jdbc.url=jdbc:log4jdbc:h2:mem:mini-service4;DB_CLOSE_DELAY=-1
|
||||
@@ -81,19 +81,10 @@
|
||||
location="classpath*:/application.properties,
|
||||
classpath*:/application.test.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
<property name="url" value="${jdbc.url}" />
|
||||
<property name="username" value="${jdbc.username}" />
|
||||
<property name="password" value="${jdbc.password}" />
|
||||
</bean>
|
||||
|
||||
<!-- 初始化数据结构 -->
|
||||
<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
|
||||
<!-- 嵌入式内存中数据库 -->
|
||||
<jdbc:embedded-database id="dataSource" type="H2">
|
||||
<jdbc:script location="classpath:sql/h2/schema.sql" />
|
||||
</jdbc:initialize-database>
|
||||
</jdbc:embedded-database>
|
||||
|
||||
<!-- 初始化默认数据 -->
|
||||
<bean class="org.springside.modules.test.data.DataInitializer" lazy-init="false">
|
||||
@@ -109,9 +100,8 @@
|
||||
classpath*:/application.functional.properties,
|
||||
classpath*:/application.functional-local.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<!-- 简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
<property name="url" value="${jdbc.url}" />
|
||||
<property name="username" value="${jdbc.username}" />
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public class BaseFunctionalTestCase {
|
||||
|
||||
baseUrl = propertiesLoader.getProperty("baseUrl", MiniWebServer.BASE_URL);
|
||||
|
||||
Boolean isEmbedded = propertiesLoader.getBoolean("embedded", true);
|
||||
Boolean isEmbedded = new URL(baseUrl).getHost().equals("localhost");
|
||||
|
||||
if (isEmbedded) {
|
||||
startJettyOnce();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
baseUrl=http://localhost:8082/mini-web
|
||||
embedded=true
|
||||
|
||||
#selenium settings, options include firefox,ie,chrome,remote:localhost:4444:firefox
|
||||
selenium.driver=firefox
|
||||
|
||||
|
||||
@@ -1,10 +1 @@
|
||||
#h2 in-memory database settings
|
||||
jdbc.driver=org.h2.Driver
|
||||
jdbc.url=jdbc:h2:mem:mini-web4;DB_CLOSE_DELAY=-1
|
||||
jdbc.username=sa
|
||||
jdbc.password=
|
||||
hibernate.dialect=org.hibernate.dialect.H2Dialect
|
||||
|
||||
#log4jdbc driver
|
||||
#jdbc.driver=net.sf.log4jdbc.DriverSpy
|
||||
#jdbc.url=jdbc:log4jdbc:h2:mem:mini-web4;DB_CLOSE_DELAY=-1
|
||||
hibernate.dialect=org.hibernate.dialect.H2Dialect
|
||||
@@ -93,32 +93,15 @@
|
||||
location="classpath*:/application.properties,
|
||||
classpath*:/application.test.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
<property name="url" value="${jdbc.url}" />
|
||||
<property name="username" value="${jdbc.username}" />
|
||||
<property name="password" value="${jdbc.password}" />
|
||||
</bean>
|
||||
|
||||
<bean id="quartzDataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<property name="driverClass" value="${quartz.jdbc.driver}" />
|
||||
<property name="url" value="${quartz.jdbc.url}" />
|
||||
<property name="username" value="${quartz.jdbc.username}" />
|
||||
<property name="password" value="${quartz.jdbc.password}" />
|
||||
</bean>
|
||||
|
||||
<!-- 初始化数据结构 -->
|
||||
<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
|
||||
<!-- 嵌入式内存中数据库 -->
|
||||
<jdbc:embedded-database id="dataSource" type="H2">
|
||||
<jdbc:script location="classpath:sql/h2/schema.sql" />
|
||||
</jdbc:initialize-database>
|
||||
</jdbc:embedded-database>
|
||||
|
||||
<!-- 初始化数据结构 -->
|
||||
<jdbc:initialize-database data-source="quartzDataSource" ignore-failures="ALL">
|
||||
<jdbc:embedded-database id="quartzDataSource" type="H2">
|
||||
<jdbc:script location="classpath:sql/h2/quartz.sql" />
|
||||
</jdbc:initialize-database>
|
||||
|
||||
</jdbc:embedded-database>
|
||||
|
||||
<!-- 初始化默认数据 -->
|
||||
<bean class="org.springside.modules.test.data.DataInitializer" lazy-init="false">
|
||||
<property name="dataSource" ref="dataSource"/>
|
||||
@@ -133,7 +116,7 @@
|
||||
classpath*:/application.functional.properties,
|
||||
classpath*:/application.functional-local.properties" />
|
||||
|
||||
<!-- 非Pool的简单data source -->
|
||||
<!-- 简单data source -->
|
||||
<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
|
||||
<!-- Connection Info -->
|
||||
<property name="driverClass" value="${jdbc.driver}" />
|
||||
@@ -154,7 +137,6 @@
|
||||
<jdbc:script location="classpath:sql/h2/schema.sql" />
|
||||
</jdbc:initialize-database>
|
||||
|
||||
<!-- 初始化数据结构 -->
|
||||
<jdbc:initialize-database data-source="quartzDataSource" ignore-failures="ALL">
|
||||
<jdbc:script location="classpath:sql/h2/quartz.sql" />
|
||||
</jdbc:initialize-database>
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ public class BaseFunctionalTestCase {
|
||||
public static void beforeClass() throws Exception {
|
||||
baseUrl = propertiesLoader.getProperty("baseUrl", ShowcaseServer.BASE_URL);
|
||||
|
||||
Boolean isEmbedded = propertiesLoader.getBoolean("embedded", true);
|
||||
Boolean isEmbedded = new URL(baseUrl).getHost().equals("localhost");
|
||||
|
||||
if (isEmbedded) {
|
||||
startJettyOnce();
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
baseUrl=http://localhost:8083/showcase
|
||||
embedded=true
|
||||
|
||||
#selenium settings, options include firefox,ie,chrome,htmlunit,remote:localhost:4444:firefox
|
||||
selenium.driver=firefox
|
||||
|
||||
|
||||
@@ -1,17 +1,3 @@
|
||||
#h2 in-memory settings
|
||||
jdbc.driver=org.h2.Driver
|
||||
jdbc.url=jdbc:h2:mem:showcase4;DB_CLOSE_DELAY=-1
|
||||
jdbc.username=sa
|
||||
jdbc.password=
|
||||
#log4jdbc driver
|
||||
#jdbc.driver=net.sf.log4jdbc.DriverSpy
|
||||
#jdbc.url=jdbc:log4jdbc:h2:mem:showcase;DB_CLOSE_DELAY=-1
|
||||
|
||||
quartz.jdbc.driver=org.h2.Driver
|
||||
quartz.jdbc.url=jdbc:h2:mem:showcase-quartz4;DB_CLOSE_DELAY=-1
|
||||
quartz.jdbc.username=sa
|
||||
quartz.jdbc.password=
|
||||
|
||||
#memcached settings
|
||||
memcached.url=localhost:11311
|
||||
|
||||
|
||||
Reference in New Issue
Block a user