diff --git a/examples/mini-service/src/main/resources/applicationContext.xml b/examples/mini-service/src/main/resources/applicationContext.xml
index 1be451cc..71fc79f1 100644
--- a/examples/mini-service/src/main/resources/applicationContext.xml
+++ b/examples/mini-service/src/main/resources/applicationContext.xml
@@ -65,19 +65,10 @@
location="classpath*:/application.properties,
classpath*:/application.test.properties" />
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -93,9 +84,8 @@
classpath*:/application.functional.properties,
classpath*:/application.functional-local.properties" />
-
+
-
diff --git a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java
index 84e947a3..2d792099 100644
--- a/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java
+++ b/examples/mini-service/src/test/functional/org/springside/examples/miniservice/functional/BaseFunctionalTestCase.java
@@ -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();
diff --git a/examples/mini-service/src/test/resources/application.functional.properties b/examples/mini-service/src/test/resources/application.functional.properties
index 6fc8bd23..9f1be152 100644
--- a/examples/mini-service/src/test/resources/application.functional.properties
+++ b/examples/mini-service/src/test/resources/application.functional.properties
@@ -1,2 +1 @@
-baseUrl=http://localhost:8084/mini-service
-embedded=true
\ No newline at end of file
+baseUrl=http://localhost:8084/mini-service
\ No newline at end of file
diff --git a/examples/mini-service/src/test/resources/application.test.properties b/examples/mini-service/src/test/resources/application.test.properties
index 7de493f6..e69de29b 100644
--- a/examples/mini-service/src/test/resources/application.test.properties
+++ b/examples/mini-service/src/test/resources/application.test.properties
@@ -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
\ No newline at end of file
diff --git a/examples/mini-web/src/main/resources/applicationContext.xml b/examples/mini-web/src/main/resources/applicationContext.xml
index 146f7de1..48090d46 100644
--- a/examples/mini-web/src/main/resources/applicationContext.xml
+++ b/examples/mini-web/src/main/resources/applicationContext.xml
@@ -81,19 +81,10 @@
location="classpath*:/application.properties,
classpath*:/application.test.properties" />
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -109,9 +100,8 @@
classpath*:/application.functional.properties,
classpath*:/application.functional-local.properties" />
-
+
-
diff --git a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java
index 5f979a72..89eda324 100644
--- a/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java
+++ b/examples/mini-web/src/test/functional/org/springside/examples/miniweb/functional/BaseFunctionalTestCase.java
@@ -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();
diff --git a/examples/mini-web/src/test/resources/application.functional.properties b/examples/mini-web/src/test/resources/application.functional.properties
index 75a8ef31..3bf33da8 100644
--- a/examples/mini-web/src/test/resources/application.functional.properties
+++ b/examples/mini-web/src/test/resources/application.functional.properties
@@ -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
diff --git a/examples/mini-web/src/test/resources/application.test.properties b/examples/mini-web/src/test/resources/application.test.properties
index 9eff814c..c19a36ec 100644
--- a/examples/mini-web/src/test/resources/application.test.properties
+++ b/examples/mini-web/src/test/resources/application.test.properties
@@ -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
\ No newline at end of file
+hibernate.dialect=org.hibernate.dialect.H2Dialect
\ No newline at end of file
diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml
index 1d853a43..afd9b950 100644
--- a/examples/showcase/src/main/resources/applicationContext.xml
+++ b/examples/showcase/src/main/resources/applicationContext.xml
@@ -93,32 +93,15 @@
location="classpath*:/application.properties,
classpath*:/application.test.properties" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
-
-
+
+
@@ -133,7 +116,7 @@
classpath*:/application.functional.properties,
classpath*:/application.functional-local.properties" />
-
+
@@ -154,7 +137,6 @@
-
diff --git a/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/BaseFunctionalTestCase.java b/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/BaseFunctionalTestCase.java
index d2544882..3f070810 100644
--- a/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/BaseFunctionalTestCase.java
+++ b/examples/showcase/src/test/functional/org/springside/examples/showcase/functional/BaseFunctionalTestCase.java
@@ -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();
diff --git a/examples/showcase/src/test/resources/application.functional.properties b/examples/showcase/src/test/resources/application.functional.properties
index f0ac6a27..cdc109b8 100644
--- a/examples/showcase/src/test/resources/application.functional.properties
+++ b/examples/showcase/src/test/resources/application.functional.properties
@@ -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
diff --git a/examples/showcase/src/test/resources/application.test.properties b/examples/showcase/src/test/resources/application.test.properties
index e66268f0..fc1f2959 100644
--- a/examples/showcase/src/test/resources/application.test.properties
+++ b/examples/showcase/src/test/resources/application.test.properties
@@ -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