From cb33fa36fd54d1edd35b6e1a4ead743e4281653a Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Fri, 20 Sep 2013 14:24:22 +1000
Subject: Use modules to initialise demo-base where possible

---
 .../src/main/config/demo-base/start.ini                 | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'tests')

diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
index e625afec2c..9a840f4db0 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/start.ini
@@ -4,16 +4,6 @@
 # Additional ini files are in demo-base/start.d
 # 
 
-# Have webapps be deployed normally from webapps directory
---module=deploy
-
-# Some of the examples use JSP
---module=jsp
-
-# We are using annotations + jndi
---module=annotations
---module=jndi
-
 # Enable security via jaas, and configure it
 --module=jaas
 jaas.login.conf=etc/login.conf
@@ -22,9 +12,6 @@ jaas.login.conf=etc/login.conf
 --module=rewrite
 etc/demo-rewrite-rules.xml
 
-# The async behavior examples use http client to access remote systems
---module=client
-
 # Websocket chat examples needs websocket enabled
 # Don't start for all contexts (set to true in test.xml context)
 org.eclipse.jetty.websocket.jsr356=false
@@ -34,7 +21,3 @@ org.eclipse.jetty.websocket.jsr356=false
 etc/test-realm.xml
 demo.realm=etc/realm.properties
 
-# Load test JNDI resources from lib/ext
---module=ext
-
-
-- 
cgit v1.2.3