diff --git a/examples/mini-service/pom.xml b/examples/mini-service/pom.xml
index 70dbf5ae6555e7b4c7945c6b5989e9b8825dee03..b3df50c7a634b7d45ba96999ca1cf4b2f89670c2 100644
--- a/examples/mini-service/pom.xml
+++ b/examples/mini-service/pom.xml
@@ -311,11 +311,11 @@
 	</build>
 
 	<profiles>
+		<!-- 仅执行smoke test-->
 		<profile>
 			<id>smoke-test</id>
 			<build>
 				<plugins>
-					<!-- 仅执行smoke test-->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -330,11 +330,11 @@
 			</build>
 		</profile>
 
+		<!-- 执行所有functional test-->
 		<profile>
 			<id>integration-test</id>
 			<build>
 				<plugins>
-					<!-- 执行所有functional test-->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -348,6 +348,7 @@
 			</build>
 		</profile>
 
+		<!-- 刷新新开发环境数据库 -->
 		<profile>
 			<id>refresh-db</id>
 			<build>
@@ -357,6 +358,7 @@
 						<artifactId>maven-antrun-plugin</artifactId>
 						<configuration>
 							<target>
+								<property file="src/main/resources/application.local.properties" />
 								<property file="src/main/resources/application.properties" />
 
 								<property name="sql.type" value="h2" />
diff --git a/examples/mini-service/src/main/resources/applicationContext.xml b/examples/mini-service/src/main/resources/applicationContext.xml
index 12344234abd7a94acd81df8a8670a74898aac996..46105873c7c6f803fa3efb9938e0e63c18a8f8d2 100644
--- a/examples/mini-service/src/main/resources/applicationContext.xml
+++ b/examples/mini-service/src/main/resources/applicationContext.xml
@@ -32,6 +32,7 @@
 	<!-- JSR303 Validator定义 -->
  	<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean" />
 
+	<!-- production/local development环境 -->
  	<beans profile="production">
  		<!-- 定义易受环境影响的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -44,7 +45,7 @@
 					<!-- 本地开发环境配置 -->
 					<value>classpath*:/application.local.properties</value>
 					<!-- 服务器生产环境配置 -->
-					<value>file:/var/mini-service/application.server.properties</value>
+					<!-- <value>file:/opt/mini-service/application.server.properties</value> -->
 				</list>
 			</property>
 		</bean>
@@ -70,6 +71,7 @@
 		<!--<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/ExampleDB" />-->
 	</beans>
 	
+	<!-- unit test环境 -->
 	<beans profile="test">
 		<!-- 定义易受环境影响的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -79,16 +81,13 @@
 				<list>
 					<!-- 标准配置 -->
 					<value>classpath*:/application.properties</value>
-					<!-- 本地开发环境配置 -->
-					<value>classpath*:/application.local.properties</value>
 					<!-- 测试环境配置 -->
 					<value>classpath*:/application.test.properties</value>
-					<!-- 本地测试环境配置 -->
-					<value>classpath*:/application.test-local.properties</value>
 				</list>
 			</property>
-		</bean>
-				
+		</bean>				
+	
+		<!-- 非Pool的简单data source -->
 		<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
 			<!-- Connection Info -->
 			<property name="driverClass" value="${jdbc.driver}" />
@@ -97,16 +96,49 @@
 			<property name="password" value="${jdbc.password}" />
 		</bean>
 		
+		<!-- 初始化数据结构 -->
 		<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
 			<jdbc:script location="classpath:sql/h2/schema.sql" />
 		</jdbc:initialize-database>
-
+	
+		<!-- 初始化默认数据 -->
 		<bean class="org.springside.modules.test.data.DefaultDataInitializer" lazy-init="false">	
 			<property name="dataSource" ref="dataSource"/>
 			<property name="defaultDataFile" value="/data/sample-data.xml" />
 		</bean>
-		
-		<!-- 以静态变量保存ApplicationContext -->
-		<bean class="org.springside.modules.test.spring.SpringContextHolder" lazy-init="false" />	 	
+	</beans>
+	
+	<!-- functional test环境 -->
+	<beans profile="functional">
+		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+			<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+			<property name="ignoreResourceNotFound" value="true" />
+			<property name="locations">
+				<list>
+					<!-- 标准配置 -->
+					<value>classpath*:/application.properties</value>
+					<!-- 本地标准配置 -->
+					<value>classpath*:/application.local.properties</value>
+					<!-- 测试环境配置 -->
+					<value>classpath*:/application.functional.properties</value>
+					<!-- 本地测试环境配置 -->
+					<value>classpath*:/application.functional-local.properties</value>
+				</list>
+			</property>
+		</bean>
+
+		<!-- 非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:script location="classpath:sql/h2/schema.sql" />
+		</jdbc:initialize-database>
 	</beans>
 </beans>
\ No newline at end of file
diff --git a/examples/mini-service/src/main/webapp/WEB-INF/web.xml b/examples/mini-service/src/main/webapp/WEB-INF/web.xml
index ca56de6a46b663808746440e4c03ab3a88553120..08f3c8770b92959ef25d2c8822b22188baae5753 100644
--- a/examples/mini-service/src/main/webapp/WEB-INF/web.xml
+++ b/examples/mini-service/src/main/webapp/WEB-INF/web.xml
@@ -15,9 +15,9 @@
 		</param-value>
 	</context-param>
 	
-	<!-- 設定Spring Context的Profile -->
+	<!-- 設定Spring Context的默认Profile -->
 	<context-param>
-    	<param-name>spring.profiles.active</param-name>
+    	<param-name>spring.profiles.default</param-name>
     	<param-value>production</param-value>
 	</context-param>
 
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 97db4917e08c1f450b1dd8f14ed5f3cc6b68150b..2b12cdf77b50da236db89df5123ceadfe66a03e6 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
@@ -30,8 +30,9 @@ public class BaseFunctionalTestCase {
 
 	protected static SimpleDriverDataSource dataSource;
 
-	protected static PropertiesLoader propertiesLoader = new PropertiesLoader(
-			"classpath:/application.functional.properties", "classpath:/application.functional-local.properties");
+	protected static PropertiesLoader propertiesLoader = new PropertiesLoader("classpath:/application.properties",
+			"classpath:/application.local.properties", "classpath:/application.functional.properties",
+			"classpath:/application.functional-local.properties");
 
 	private static Logger logger = LoggerFactory.getLogger(BaseFunctionalTestCase.class);
 
@@ -54,8 +55,10 @@ public class BaseFunctionalTestCase {
 	 */
 	protected static void startJettyOnce() throws Exception {
 		if (jettyServer == null) {
-			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT,
-					"src/test/resources/web.xml");
+			//设定Spring的profile
+			System.setProperty("spring.profiles.active", "functional");
+
+			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT);
 			jettyServer.start();
 
 			logger.info("Jetty Server started");
diff --git a/examples/mini-service/src/test/resources/application.functional.properties b/examples/mini-service/src/test/resources/application.functional.properties
index 9fed68a29ba223a7bdf0f07bf5ff958228832c25..6fc8bd23c07fe616a40b3047c695462fef63adef 100644
--- a/examples/mini-service/src/test/resources/application.functional.properties
+++ b/examples/mini-service/src/test/resources/application.functional.properties
@@ -1,8 +1,2 @@
 baseUrl=http://localhost:8084/mini-service
-embedded=true
-
-jdbc.driver=org.h2.Driver
-jdbc.url=jdbc:h2:mem:mini-service4;DB_CLOSE_DELAY=-1
-jdbc.username=sa
-jdbc.password=
-
+embedded=true
\ No newline at end of file
diff --git a/examples/mini-service/src/test/resources/web.xml b/examples/mini-service/src/test/resources/web.xml
deleted file mode 100644
index 182c1c95a835114a5a23a95c7d7c1eedc2590024..0000000000000000000000000000000000000000
--- a/examples/mini-service/src/test/resources/web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>mini-service</display-name>
-
-	<!-- Spring ApplicationContext配置文件的路径,可使用通配符,多个路径用,号分隔 此参数用于后面的Spring Context Loader -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath*:/applicationContext.xml
-			classpath*:/applicationContext-rs-server.xml
-			classpath*:/applicationContext-ws-server.xml
-		</param-value>
-	</context-param>
-	
-	<!-- 設定Spring Context的Profile -->
-	<context-param>
-    	<param-name>spring.profiles.active</param-name>
-    	<param-value>test</param-value>
-	</context-param>
-
-	<!--Spring ApplicationContext 载入 -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- CXF 配置 -->
-	<servlet>
-		<servlet-name>CXFServlet</servlet-name>
-		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>CXFServlet</servlet-name>
-		<url-pattern>/ws/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- Jersey 配置 -->
-	<servlet>
-		<servlet-name>JerseyServlet</servlet-name>
-		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
-		<!-- 使用Jackson for JSON格式 -->
-		<init-param>
-			<param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>JerseyServlet</servlet-name>
-		<url-pattern>/rs/*</url-pattern>
-	</servlet-mapping>
-</web-app>
diff --git a/examples/mini-web/pom.xml b/examples/mini-web/pom.xml
index 9464d95f90d397527f556466ecd5782a4381e0e2..d99e14f1bac8fc31f5297efcd70b45fb9c2e681d 100644
--- a/examples/mini-web/pom.xml
+++ b/examples/mini-web/pom.xml
@@ -319,11 +319,11 @@
 	</build>
 	
 	<profiles>
+		<!-- 仅执行smoke test-->
 		<profile>
 			<id>smoke-test</id>
 			<build>
 				<plugins>
-					<!-- 仅执行smoke test-->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -341,12 +341,12 @@
 				</plugins>
 			</build>
 		</profile>
-
+		
+		<!-- 执行所有functional test-->
 		<profile>
 			<id>integration-test</id>
 			<build>
 				<plugins>
-					<!-- 执行所有functional test-->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -363,7 +363,8 @@
 				</plugins>
 			</build>
 		</profile>
-			
+
+		<!-- 刷新开发环境数据库 -->			
 		<profile>
 			<id>refresh-db</id>
 			<build>
@@ -373,7 +374,8 @@
         				<artifactId>maven-antrun-plugin</artifactId>
         				<configuration>
               				<target>
-                				<property file="src/main/resources/application.properties" />
+                				<property file="src/main/resources/application.local.properties" />
+								<property file="src/main/resources/application.properties" />
 
 								<property name="sql.type" value="h2" />
 								<property name="dbunit.datatype" value="org.dbunit.ext.h2.H2DataTypeFactory" />
diff --git a/examples/mini-web/src/main/resources/applicationContext.xml b/examples/mini-web/src/main/resources/applicationContext.xml
index 6723e1fe4ba034ee9695d76d474326a5f4f90244..37065f6757a763d4ff35690d0b9cfc9d6ac31170 100644
--- a/examples/mini-web/src/main/resources/applicationContext.xml
+++ b/examples/mini-web/src/main/resources/applicationContext.xml
@@ -48,8 +48,9 @@
 	<!-- 使用annotation定义事务 -->
 	<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
 	
-	<beans profile="production">
-		<!-- 定义受环境影响易变的变量 -->
+	<!-- production/local development环境 -->
+ 	<beans profile="production">
+ 		<!-- 定义易受环境影响的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 			<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 			<property name="ignoreResourceNotFound" value="true" />
@@ -60,32 +61,35 @@
 					<!-- 本地开发环境配置 -->
 					<value>classpath*:/application.local.properties</value>
 					<!-- 服务器生产环境配置 -->
-					<value>file:/var/mini-web/application.server.properties</value>
+					<!-- <value>file:/opt/mini-service/application.server.properties</value> -->
 				</list>
 			</property>
 		</bean>
-
-		<!-- 数据源配置,使用应用内的DBCP数据库连接池 -->
-		<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="false">
+		
+		<!-- 数据源配置, 使用应用中的DBCP数据库连接池 -->
+		<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
 			<!-- Connection Info -->
 			<property name="driverClassName" value="${jdbc.driver}" />
 			<property name="url" value="${jdbc.url}" />
 			<property name="username" value="${jdbc.username}" />
 			<property name="password" value="${jdbc.password}" />
-	
+		
 			<!-- Connection Pooling Info -->
-			<property name="maxIdle" value="${dbcp.maxIdle}" />
 			<property name="maxActive" value="${dbcp.maxActive}" />
+			<property name="maxIdle" value="${dbcp.maxIdle}" />
 			<property name="defaultAutoCommit" value="false" />
+			<!-- 连接Idle一个小时后超时 -->
 			<property name="timeBetweenEvictionRunsMillis" value="3600000" />
 			<property name="minEvictableIdleTimeMillis" value="3600000" />
 		</bean>
-
+		
 		<!-- 数据源配置,使用应用服务器的数据库连接池 -->
 		<!--<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/ExampleDB" />-->
 	</beans>
 	
+	<!-- unit test环境 -->
 	<beans profile="test">
+		<!-- 定义易受环境影响的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 			<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 			<property name="ignoreResourceNotFound" value="true" />
@@ -93,18 +97,15 @@
 				<list>
 					<!-- 标准配置 -->
 					<value>classpath*:/application.properties</value>
-					<!-- 本地开发环境配置 -->
-					<value>classpath*:/application.local.properties</value>
 					<!-- 测试环境配置 -->
 					<value>classpath*:/application.test.properties</value>
-					<!-- 本地测试环境配置 -->
-					<value>classpath*:/application.test-local.properties</value>
 				</list>
 			</property>
-		</bean>
-		
+		</bean>				
+	
 		<!-- 非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}" />
@@ -115,13 +116,45 @@
 		<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
 			<jdbc:script location="classpath:sql/h2/schema.sql" />
 		</jdbc:initialize-database>
-
+	
+		<!-- 初始化默认数据 -->
 		<bean class="org.springside.modules.test.data.DefaultDataInitializer" lazy-init="false">	
 			<property name="dataSource" ref="dataSource"/>
 			<property name="defaultDataFile" value="/data/sample-data.xml" />
 		</bean>
+	</beans>
+	
+	<!-- functional test环境 -->
+	<beans profile="functional">
+		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+			<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+			<property name="ignoreResourceNotFound" value="true" />
+			<property name="locations">
+				<list>
+					<!-- 标准配置 -->
+					<value>classpath*:/application.properties</value>
+					<!-- 本地标准配置 -->
+					<value>classpath*:/application.local.properties</value>
+					<!-- 测试环境配置 -->
+					<value>classpath*:/application.functional.properties</value>
+					<!-- 本地测试环境配置 -->
+					<value>classpath*:/application.functional-local.properties</value>
+				</list>
+			</property>
+		</bean>
+
+		<!-- 非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>
 
-		<!-- 以静态变量保存ApplicationContext -->
-		<bean class="org.springside.modules.test.spring.SpringContextHolder" lazy-init="false" />	 	
+		<!-- 初始化数据结构 -->
+		<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
+			<jdbc:script location="classpath:sql/h2/schema.sql" />
+		</jdbc:initialize-database>
 	</beans>
 </beans>
\ No newline at end of file
diff --git a/examples/mini-web/src/main/webapp/WEB-INF/web.xml b/examples/mini-web/src/main/webapp/WEB-INF/web.xml
index 7108740ee34d16977031815d7afb86d0c481307d..5e0ba12db79f73fef763912f045addfe8ad0c77e 100644
--- a/examples/mini-web/src/main/webapp/WEB-INF/web.xml
+++ b/examples/mini-web/src/main/webapp/WEB-INF/web.xml
@@ -15,9 +15,9 @@
 		</param-value>
 	</context-param>
 	
-	<!-- 設定Spring Context的Profile -->
+	<!-- 設定Spring Context的默认Profile -->
 	<context-param>
-    	<param-name>spring.profiles.active</param-name>
+    	<param-name>spring.profiles.default</param-name>
     	<param-value>production</param-value>
 	</context-param>
 	
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 4f5a08e96e0124a96c8fb9aab025f8ca7497594f..01ff78be9cbb74da1915223bb52e35525a9aa798 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
@@ -39,8 +39,9 @@ public class BaseFunctionalTestCase {
 
 	protected static Selenium2 s;
 
-	protected static PropertiesLoader propertiesLoader = new PropertiesLoader(
-			"classpath:/application.functional.properties", "classpath:/application.functional-local.properties");
+	protected static PropertiesLoader propertiesLoader = new PropertiesLoader("classpath:/application.properties",
+			"classpath:/application.local.properties", "classpath:/application.functional.properties",
+			"classpath:/application.functional-local.properties");
 
 	private static Logger logger = LoggerFactory.getLogger(BaseFunctionalTestCase.class);
 
@@ -72,8 +73,10 @@ public class BaseFunctionalTestCase {
 	 */
 	protected static void startJettyOnce() throws Exception {
 		if (jettyServer == null) {
-			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT,
-					"src/test/resources/web.xml");
+			//设定Spring的profile
+			System.setProperty("spring.profiles.active", "functional");
+
+			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT);
 			jettyServer.start();
 
 			logger.info("Jetty Server started");
diff --git a/examples/mini-web/src/test/resources/application.functional.properties b/examples/mini-web/src/test/resources/application.functional.properties
index 121d31d84afd1b090e7043c6b65de43b494fda9c..75a8ef312bfa2f3cf99a234ca76b75c756bde0dc 100644
--- a/examples/mini-web/src/test/resources/application.functional.properties
+++ b/examples/mini-web/src/test/resources/application.functional.properties
@@ -1,10 +1,5 @@
 baseUrl=http://localhost:8082/mini-web
 embedded=true
-
-jdbc.driver=org.h2.Driver
-jdbc.url=jdbc:h2:mem:mini-web4;DB_CLOSE_DELAY=-1
-jdbc.username=sa
-jdbc.password=
-
 #selenium settings, options include firefox,ie,chrome,remote:localhost:4444:firefox
-selenium.driver=firefox
\ No newline at end of file
+selenium.driver=firefox
+
diff --git a/examples/mini-web/src/test/resources/web.xml b/examples/mini-web/src/test/resources/web.xml
deleted file mode 100644
index ad9d953bba734865b12c15758133246a85c897d3..0000000000000000000000000000000000000000
--- a/examples/mini-web/src/test/resources/web.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>mini-web</display-name>
-	
-	<!-- Spring ApplicationContext配置文件的路径,可使用通配符,多个路径用,号分隔
-		此参数用于后面的Spring Context Loader -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath*:/applicationContext.xml
-			classpath*:/applicationContext-shiro.xml
-		</param-value>
-	</context-param>
-
-	<!-- 設定Spring Context的Profile -->
-	<context-param>
-    	<param-name>spring.profiles.active</param-name>
-    	<param-value>test</param-value>
-	</context-param>
-	
-	<!-- Filter 定义  -->
-	<!-- Character Encoding filter -->
-	<filter>
-		<filter-name>encodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>encodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- Open Entity Manager in View filter-->
-	<filter>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-	
-	<!-- Shiro Security filter-->
-	<filter>
-		<filter-name>shiroFilter</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>shiroFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- Sitemesh filter -->
-	<filter>
-		<filter-name>sitemeshFilter</filter-name>
-		<filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>sitemeshFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-  
-	<!-- Spring MVC Servlet -->
-	<servlet>
-		<servlet-name>springServlet</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/spring-mvc.xml</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>springServlet</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-	
-	<!--Spring的ApplicationContext 载入 -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- session超时定义,单位为分钟 -->
-	<session-config>
-		<session-timeout>20</session-timeout>
-	</session-config>
-
-	<!-- 出错页面定义 -->
-	<error-page>
-		<exception-type>java.lang.Throwable</exception-type>
-		<location>/WEB-INF/views/error/500.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>500</error-code>
-		<location>/WEB-INF/views/error/500.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>404</error-code>
-		<location>/WEB-INF/views/error/404.jsp</location>
-	</error-page>
-</web-app>
diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml
index 7372f98562f9679b02c5683595fb12f90d37c7ab..02e69e48580746fb6d1f90c32820516d5fe4c09d 100644
--- a/examples/showcase/pom.xml
+++ b/examples/showcase/pom.xml
@@ -476,11 +476,11 @@
 	</build>
 
 	<profiles>
+		<!-- 仅执行smoke test -->
 		<profile>
 			<id>smoke-test</id>
 			<build>
 				<plugins>
-					<!-- 仅执行smoke test -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -499,11 +499,11 @@
 			</build>
 		</profile>
 
+		<!-- 执行所有functional test -->
 		<profile>
 			<id>integration-test</id>
 			<build>
 				<plugins>
-					<!-- 执行所有functional test -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
@@ -521,6 +521,7 @@
 			</build>
 		</profile>
 
+		<!-- 刷新开发环境数据库 -->	
 		<profile>
 			<id>refresh-db</id>
 			<build>
@@ -530,6 +531,7 @@
 						<artifactId>maven-antrun-plugin</artifactId>
 						<configuration>
 							<target>
+								<property file="src/main/resources/application.local.properties" />
 								<property file="src/main/resources/application.properties" />
 
 								<property name="sql.type" value="h2" />
diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml
index 85e9c1b127ba0bb5b52ab3786245200817c4c50b..71ca6571cdf09f1cdad5c9604f3ac9751987e819 100644
--- a/examples/showcase/src/main/resources/applicationContext.xml
+++ b/examples/showcase/src/main/resources/applicationContext.xml
@@ -58,6 +58,7 @@
 	<!-- hibernat validator -->
 	<bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
 
+	<!-- production/local development环境 -->
 	<beans profile="production">
 		<!-- 定义受环境影响易变的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -70,7 +71,7 @@
 					<!-- 本地开发环境配置 -->
 					<value>classpath*:/application.local.properties</value>
 					<!-- 服务器生产环境配置 -->
-					<value>file:/opt/springside/showcase/application.server.properties</value>
+					<!-- <value>file:/opt/springside/showcase/application.server.properties</value> -->
 				</list>
 			</property>
 		</bean>
@@ -94,6 +95,7 @@
 		</bean>
 	</beans>
 	
+	<!-- unit test环境 -->
 	<beans profile="test">
 		<!-- 定义受环境影响易变的变量 -->
 		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -103,17 +105,13 @@
 				<list>
 					<!-- 标准配置 -->
 					<value>classpath*:/application.properties</value>
-					<!-- 本地开发环境配置 -->
-					<value>classpath*:/application.local.properties</value>
 					<!-- 测试环境配置 -->
 					<value>classpath*:/application.test.properties</value>
-					<!-- 本地测试环境配置 -->
-					<value>classpath*:/application.test-local.properties</value>
 				</list>
 			</property>
 		</bean>
 		
-		<!-- 数据源配置,在测试环境使用JDBC直接连接 -->
+		<!-- 非Pool的简单data source -->
 		<bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
 			<!-- Connection Info -->
 			<property name="driverClass" value="${jdbc.driver}" />
@@ -129,23 +127,66 @@
 			<property name="password" value="${quartz.jdbc.password}" />
 		</bean>
 				
-		<!-- 运行脚本初始化内存数据库 -->
+		<!-- 初始化数据结构 -->
 		<jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
 			<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>
 
+		<!-- 初始化默认数据 -->
 		<bean class="org.springside.modules.test.data.DefaultDataInitializer" lazy-init="false">	
 			<property name="dataSource" ref="dataSource"/>
 			<property name="defaultDataFile" value="/data/sample-data.xml" />
 		</bean>
-	
-		<!-- SpringContextHolder定义 -->
-		<bean class="org.springside.modules.test.spring.SpringContextHolder" lazy-init="false" />	
 	</beans>
+	<!-- functional test环境 -->
+	<beans profile="functional">
+		<!-- 定义受环境影响易变的变量 -->
+		<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+			<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+			<property name="ignoreResourceNotFound" value="true" />
+			<property name="locations">
+				<list>
+					<!-- 标准配置 -->
+					<value>classpath*:/application.properties</value>
+					<!-- 本地标准配置 -->
+					<value>classpath*:/application.local.properties</value>
+					<!-- 测试环境配置 -->
+					<value>classpath*:/application.functional.properties</value>
+					<!-- 本地测试环境配置 -->
+					<value>classpath*:/application.functional-local.properties</value>
+				</list>
+			</property>
+		</bean>
+		
+		<!-- 非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: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>
+	</beans>	
 </beans>
\ No newline at end of file
diff --git a/examples/showcase/src/main/webapp/WEB-INF/web.xml b/examples/showcase/src/main/webapp/WEB-INF/web.xml
index fedba54a467a8c8356d602b2610e01090b7b29db..615ace4d4adeec685dc8a9048dbeb0aa9c715b3b 100644
--- a/examples/showcase/src/main/webapp/WEB-INF/web.xml
+++ b/examples/showcase/src/main/webapp/WEB-INF/web.xml
@@ -14,9 +14,9 @@
 		</param-value>
 	</context-param>
 	
-	<!-- 設定Spring Context的Profile -->
+	<!-- 設定Spring Context的默认Profile -->
 	<context-param>
-    	<param-name>spring.profiles.active</param-name>
+    	<param-name>spring.profiles.default</param-name>
     	<param-value>production</param-value>
 	</context-param>
 
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 91cac1f07773b4f5d313fe90c826e90eb669a027..5c10e00bdb13d6fa3f9bffee504bb377ef4faacc 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
@@ -28,8 +28,9 @@ public class BaseFunctionalTestCase {
 
 	protected static SimpleDriverDataSource dataSource;
 
-	protected static PropertiesLoader propertiesLoader = new PropertiesLoader(
-			"classpath:/application.functional.properties", "classpath:/application.functional-local.properties");
+	protected static PropertiesLoader propertiesLoader = new PropertiesLoader("classpath:/application.properties",
+			"classpath:/application.local.properties", "classpath:/application.functional.properties",
+			"classpath:/application.functional-local.properties");
 
 	private static Logger logger = LoggerFactory.getLogger(BaseFunctionalTestCase.class);
 
@@ -52,8 +53,10 @@ public class BaseFunctionalTestCase {
 	 */
 	protected static void startJettyOnce() throws Exception {
 		if (jettyServer == null) {
-			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT,
-					"src/test/resources/web.xml");
+			//设定Spring的profile
+			System.setProperty("spring.profiles.active", "functional");
+
+			jettyServer = JettyFactory.createServer(new URL(baseUrl).getPort(), Start.CONTEXT);
 			jettyServer.start();
 
 			logger.info("Jetty Server started");
diff --git a/examples/showcase/src/test/resources/application.functional.properties b/examples/showcase/src/test/resources/application.functional.properties
index 1f526ddaa75302a7a42b32c47970b8bb9a3261d6..f0ac6a274e4f6840c1bf0850acfc1eebeae86f3a 100644
--- a/examples/showcase/src/test/resources/application.functional.properties
+++ b/examples/showcase/src/test/resources/application.functional.properties
@@ -1,11 +1,6 @@
 baseUrl=http://localhost:8083/showcase
 embedded=true
-
-jdbc.driver=org.h2.Driver
-jdbc.url=jdbc:h2:mem:showcase4;DB_CLOSE_DELAY=-1
-jdbc.username=sa
-jdbc.password=
-
 #selenium settings, options include firefox,ie,chrome,htmlunit,remote:localhost:4444:firefox
 selenium.driver=firefox
 
+
diff --git a/examples/showcase/src/test/resources/web.xml b/examples/showcase/src/test/resources/web.xml
deleted file mode 100644
index 2f3c4ddfae0a1743e78281168ddc84ad94405cca..0000000000000000000000000000000000000000
--- a/examples/showcase/src/test/resources/web.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	version="2.5">
-
-	<display-name>showcase</display-name>
-	
-	<!-- Spring ApplicationContext配置文件的路径,可使用通配符，用于后面的Spring Context Loader -->
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>
-			classpath*:/applicationContext.xml
-			classpath*:/applicationContext-showcases.xml
-		</param-value>
-	</context-param>
-	
-	<!-- 設定Spring Context的Profile -->
-	<context-param>
-    	<param-name>spring.profiles.active</param-name>
-    	<param-value>test</param-value>
-	</context-param>
-
-	<!--Spring ApplicationContext 载入 -->
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-
-	<!-- Spring MVC Servlet -->
-	<servlet>
-		<servlet-name>springServlet</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<init-param>
-			<param-name>contextConfigLocation</param-name>
-			<param-value>/WEB-INF/spring-mvc.xml</param-value>
-		</init-param>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>springServlet</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
-
-	<!-- Jersey Servlet 配置 -->
-	<servlet>
-		<servlet-name>JerseyServlet</servlet-name>
-		<servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
-		<!-- 使用Jackson for JSON格式 -->
-		<init-param>
-			<param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>JerseyServlet</servlet-name>
-		<url-pattern>/rs/*</url-pattern>
-	</servlet-mapping>
-
-	<!-- Content Servlet 配置 -->
-	<servlet>
-		<servlet-name>StaticContentServlet</servlet-name>
-		<servlet-class>org.springside.examples.showcase.web.StaticContentServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>StaticContentServlet</servlet-name>
-		<url-pattern>/static-content</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>RemoteContentServlet</servlet-name>
-		<servlet-class>org.springside.examples.showcase.web.RemoteContentServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>RemoteContentServlet</servlet-name>
-		<url-pattern>/remote-content</url-pattern>
-	</servlet-mapping>
-
-	<!-- Filter 定义 -->
-	<!-- Character Encoding filter -->
-	<filter>
-		<filter-name>encodingFilter</filter-name>
-		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
-		<init-param>
-			<param-name>encoding</param-name>
-			<param-value>UTF-8</param-value>
-		</init-param>
-		<init-param>
-			<param-name>forceEncoding</param-name>
-			<param-value>true</param-value>
-		</init-param>
-	</filter>
-	<filter-mapping>
-		<filter-name>encodingFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>FORWARD</dispatcher>
-	</filter-mapping>
-
-	<!-- Open Entity Manager in View filter-->
-	<filter>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>openEntityManagerInViewFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- Shiro filter -->
-	<filter>
-		<filter-name>shiroFilter</filter-name>
-		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>shiroFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>FORWARD</dispatcher>
-	</filter-mapping>
-
-	<!-- Cache Control Header Filter -->
-	<filter>
-		<filter-name>cacheControlHeaderFilter</filter-name>
-		<filter-class>org.springside.examples.showcase.web.CacheControlHeaderFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>cacheControlHeaderFilter</filter-name>
-		<url-pattern>/static/*</url-pattern>
-	</filter-mapping>
-
-	<filter>
-		<filter-name>sitemeshFilter</filter-name>
-		<filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>sitemeshFilter</filter-name>
-		<url-pattern>/*</url-pattern>
-	</filter-mapping>
-
-	<!-- 出错页面定义 -->
-	<error-page>
-		<exception-type>java.lang.Throwable</exception-type>
-		<location>/WEB-INF/views/error/500.jsp</location>
-	</error-page>
-	<error-page>
-		<error-code>500</error-code>
-		<location>/WEB-INF/views/error/500.jsp</location>
-	</error-page>
-</web-app>
diff --git a/modules/core/src/main/java/org/springside/modules/test/functional/JettyFactory.java b/modules/core/src/main/java/org/springside/modules/test/functional/JettyFactory.java
index 893b0631a21127bfdd4a803c52f953b3e63bf1fe..297e911cd7184846962c4c947e0eaf627911348e 100644
--- a/modules/core/src/main/java/org/springside/modules/test/functional/JettyFactory.java
+++ b/modules/core/src/main/java/org/springside/modules/test/functional/JettyFactory.java
@@ -31,13 +31,4 @@ public class JettyFactory {
 
 		return server;
 	}
-
-	/**
-	 * 创建Jetty Server,以	以src/main/webapp为Web应用目录并重新制定web.xml路径。
-	 */
-	public static Server createServer(int port, String contextPath, String webxmlPath) {
-		Server server = createServer(port, contextPath);
-		((WebAppContext) server.getHandler()).setDescriptor(webxmlPath);
-		return server;
-	}
 }
diff --git a/modules/core/src/test/java/org/springside/modules/test/functional/JettyFactoryTest.java b/modules/core/src/test/java/org/springside/modules/test/functional/JettyFactoryTest.java
index 3901ba789e1c536014f370742e45da9f782b354c..41c8c1681074960c3042a154c9bccff4551cfe30 100644
--- a/modules/core/src/test/java/org/springside/modules/test/functional/JettyFactoryTest.java
+++ b/modules/core/src/test/java/org/springside/modules/test/functional/JettyFactoryTest.java
@@ -19,7 +19,7 @@ public class JettyFactoryTest {
 
 	@Test
 	public void createTestServer() {
-		Server server = JettyFactory.createServer(1978, "core", "src/test/resources/web.xml");
+		Server server = JettyFactory.createServer(1978, "core");
 
 		assertEquals(1978, server.getConnectors()[0].getPort());
 		assertEquals("core", ((WebAppContext) server.getHandler()).getContextPath());