diff --git a/hsarback/build.xml b/hsarback/build.xml
index 12d7622..9911a7e 100644
--- a/hsarback/build.xml
+++ b/hsarback/build.xml
@@ -55,7 +55,7 @@
 	</target>
 	
 	<target name="war" depends="enhance">
-		<copy file="conf/WEB-INF/web.xml" todir="webapp/WEB-INF/">
+		<copy file="conf/WEB-INF/${target}-web.xml" todir="webapp/WEB-INF/">
 			<filterset>
 				<filter token="LOGIN_HOST" value="${cas.domain.name}"/>
 				<filter token="LOGIN_PORT" value="${cas.https.port}"/>
@@ -63,6 +63,8 @@
 				<filter token="CONFIG_PORT" value="${hsar.https.port}"/>
 			</filterset>
 		</copy>
+		<copy file="conf/WEB-INF/${target}-context.xml" todir="webapp/META-INF/">
+		</copy>
         <war destfile="build/hsar.war" basedir="webapp">
         	<lib dir="lib">
     		    <include name="**/*.jar"/>
diff --git a/hsarback/webapp/META-INF/context.xml b/hsarback/conf/META-INF/prod-context.xml
similarity index 85%
rename from hsarback/webapp/META-INF/context.xml
rename to hsarback/conf/META-INF/prod-context.xml
index 9b53ba3..e84ba48 100644
--- a/hsarback/webapp/META-INF/context.xml
+++ b/hsarback/conf/META-INF/prod-context.xml
@@ -10,11 +10,6 @@
 		global="jms/QueueCF"
 		type="javax.jms.QueueConnectionFactory"/>
 
-	<ResourceLink
-		name="jms/hsadminSystem-h81"
-		global="jms/hsadminSystem-h81"
-		type="javax.jms.Queue"/>
-
 	<ResourceLink
 		name="jms/hsadminSystem-h01"
 		global="jms/hsadminSystem-h01"
@@ -70,16 +65,6 @@
 		global="jms/hsadminSystem-h52"
 		type="javax.jms.Queue"/>
 
-	<ResourceLink
-		name="jms/hsadminSystem-h53"
-		global="jms/hsadminSystem-h53"
-		type="javax.jms.Queue"/>
-
-	<ResourceLink
-		name="jms/hsadminSystem-h54"
-		global="jms/hsadminSystem-h54"
-		type="javax.jms.Queue"/>
-
 	<ResourceLink
 		name="jms/hsadminSystem-h55"
 		global="jms/hsadminSystem-h55"
@@ -130,11 +115,6 @@
 		global="jms/hsadminSystem-dns3"
 		type="javax.jms.Queue"/>
 
-	<ResourceLink
-		name="jms/hsadminSystem-backupmx"
-		global="jms/hsadminSystem-backupmx"
-		type="javax.jms.Queue"/>
-
 	<ResourceLink
 		name="jms/hsadminStatus"
 		global="jms/hsadminStatus"
diff --git a/hsarback/conf/META-INF/test-context.xml b/hsarback/conf/META-INF/test-context.xml
new file mode 100644
index 0000000..808ab2b
--- /dev/null
+++ b/hsarback/conf/META-INF/test-context.xml
@@ -0,0 +1,33 @@
+<Context path="/hsar" reloadable="true" crossContext="true">
+
+	<ResourceLink
+		name="jdbc/HSAdminDB"
+		global="jdbc/HSAdminDB"
+		type="javax.sql.DataSource"/>
+
+	<ResourceLink
+		name="jms/QueueCF"
+		global="jms/QueueCF"
+		type="javax.jms.QueueConnectionFactory"/>
+
+	<ResourceLink
+		name="jms/hsadminSystem-h99"
+		global="jms/hsadminSystem-h99"
+		type="javax.jms.Queue"/>
+
+	<ResourceLink
+		name="jms/hsadminSystem-testmail"
+		global="jms/hsadminSystem-testmail"
+		type="javax.jms.Queue"/>
+
+	<ResourceLink
+		name="jms/hsadminSystem-testdns"
+		global="jms/hsadminSystem-testdns"
+		type="javax.jms.Queue"/>
+
+	<ResourceLink
+		name="jms/hsadminStatus"
+		global="jms/hsadminStatus"
+		type="javax.jms.Queue"/>
+
+</Context>
diff --git a/hsarback/webapp/WEB-INF/web.xml b/hsarback/conf/WEB-INF/prod-web.xml
similarity index 96%
rename from hsarback/webapp/WEB-INF/web.xml
rename to hsarback/conf/WEB-INF/prod-web.xml
index 4030a94..fc3cec1 100644
--- a/hsarback/webapp/WEB-INF/web.xml
+++ b/hsarback/conf/WEB-INF/prod-web.xml
@@ -19,11 +19,11 @@
 	  	<servlet-class>de.hsadmin.cliClientConnector.CLIClientConnectorServlet</servlet-class>
   		<init-param>
 	  		<param-name>proxyValidateUrl</param-name>
-		  	<param-value>https://${cas.domain.name}:${cas.https.port}/cas/proxyValidate</param-value>
+		  	<param-value>https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate</param-value>
   		</init-param>
   		<init-param>
 	  		<param-name>proxyServiceUrl</param-name>
-		  	<param-value>https://${hsar.domain.name}:${hsar.https.port}/hsar/backend</param-value>
+		  	<param-value>https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend</param-value>
   		</init-param>
 	  	<init-param>
   			<param-name>Components</param-name>
@@ -157,12 +157,6 @@
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
  	    
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h81</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
     <resource-ref>
         <res-ref-name>jms/hsadminSystem-h01</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
diff --git a/hsarback/conf/WEB-INF/web.xml b/hsarback/conf/WEB-INF/test-web.xml
similarity index 55%
rename from hsarback/conf/WEB-INF/web.xml
rename to hsarback/conf/WEB-INF/test-web.xml
index 827cd3c..65199c0 100644
--- a/hsarback/conf/WEB-INF/web.xml
+++ b/hsarback/conf/WEB-INF/test-web.xml
@@ -158,157 +158,19 @@
     </resource-ref>
  	    
     <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h81</res-ref-name>
+        <res-ref-name>jms/hsadminSystem-h99</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
     <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h01</res-ref-name>
+        <res-ref-name>jms/hsadminSystem-testdns</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>
     </resource-ref>
     <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h02</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h03</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h04</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h05</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h06</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h07</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h08</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h09</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h50</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h51</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h52</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h53</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h54</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h55</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h56</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h57</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-h58</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-dns1</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-dns2</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-dns3</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-mail1</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-mail2</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-mail3</res-ref-name>
-        <res-type>javax.jms.Queue</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
-    <resource-ref>
-        <res-ref-name>jms/hsadminSystem-backupmx</res-ref-name>
+        <res-ref-name>jms/hsadminSystem-testmail</res-ref-name>
         <res-type>javax.jms.Queue</res-type>
         <res-auth>Container</res-auth>
         <res-sharing-scope>Shareable</res-sharing-scope>