diff --git a/impl/extension/servlet/src/test/java/security/SecurityServlet.java b/impl/extension/servlet/src/test/java/security/SecurityServlet.java
index af6a235..37ebc47 100644
--- a/impl/extension/servlet/src/test/java/security/SecurityServlet.java
+++ b/impl/extension/servlet/src/test/java/security/SecurityServlet.java
@@ -25,8 +25,8 @@ public class SecurityServlet extends HttpServlet {
 		result = (result == null ? request.getHeader("authorization") : result);
 
 		Credentials credentials = Beans.getReference(Credentials.class);
-		credentials.setUsername("asdrubal");
-		credentials.setPassword("asdrubal");
+		credentials.setUsername(request.getParameter("username"));
+		credentials.setPassword(request.getParameter("password"));
 
 		Beans.getReference(SecurityContext.class).login();
 
diff --git a/impl/extension/servlet/src/test/java/security/SecurityTest.java b/impl/extension/servlet/src/test/java/security/SecurityTest.java
index 3cfbc25..17b8885 100644
--- a/impl/extension/servlet/src/test/java/security/SecurityTest.java
+++ b/impl/extension/servlet/src/test/java/security/SecurityTest.java
@@ -10,6 +10,8 @@ import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpParamsNames;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -36,12 +38,28 @@ public class SecurityTest {
 	}
 
 	@Test
-	public void login() throws ClientProtocolException, IOException {
+	public void loginSucessfull() throws ClientProtocolException, IOException {
 		DefaultHttpClient client = new DefaultHttpClient();
-		HttpGet get = new HttpGet(deploymentUrl + "/login");
+//		HttpGet get = new HttpGet(deploymentUrl + "/login");
+//		get.getParams().setParameter("username", "demoiselle");
+//		get.getParams().setParameter("password", "changeit");
+		HttpGet get = new HttpGet(deploymentUrl + "/login?username=demoiselle&password=changeit");
 		HttpResponse response = client.execute(get);
 
 		int status = response.getStatusLine().getStatusCode();
 		assertEquals(HttpStatus.SC_OK, status);
 	}
+	
+//	@Test
+//	public void loginFailed() throws ClientProtocolException, IOException {
+//		DefaultHttpClient client = new DefaultHttpClient();
+////		HttpGet get = new HttpGet(deploymentUrl + "/login");
+////		get.getParams().setParameter("username", "demoiselle");
+////		get.getParams().setParameter("password", "changeit");
+//		HttpGet get = new HttpGet(deploymentUrl + "/login?username=demoiselle&password=wrongpass");
+//		HttpResponse response = client.execute(get);
+//		
+//		int status = response.getStatusLine().getStatusCode();
+//		assertEquals(HttpStatus.S, status);
+//	}
 }
diff --git a/impl/extension/servlet/src/test/resources/domain.xml b/impl/extension/servlet/src/test/resources/domain.xml
index a0476b2..1c8bcbf 100644
--- a/impl/extension/servlet/src/test/resources/domain.xml
+++ b/impl/extension/servlet/src/test/resources/domain.xml
@@ -7,40 +7,28 @@
       </module>
     </application>
   </system-applications>
-  <applications>
-    <application context-root="/AuthenticationPrj01" location="${com.sun.aas.instanceRootURI}/eclipseApps/AuthenticationPrj01/" name="AuthenticationPrj01" directory-deployed="true" object-type="user">
-      <property name="appLocation" value="${com.sun.aas.instanceRootURI}/eclipseApps/AuthenticationPrj01/"></property>
-      <property name="defaultAppName" value="AuthenticationPrj01"></property>
-      <module name="AuthenticationPrj01">
-        <engine sniffer="security"></engine>
-        <engine sniffer="web"></engine>
-      </module>
-    </application>
-  </applications>
+  <applications></applications>
   <resources>
-    <jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.ClientXADataSource" res-type="javax.sql.XADataSource" name="luciano" transaction-isolation-level="serializable">
-      <property name="User" value="APP"></property>
-      <property name="Password" value="APP"></property>
-      <property name="ServerName" value="localhost"></property>
-      <property name="PortNumber" value="1527"></property>
-      <property name="DatabaseName" value="luciano"></property>
+    <jdbc-resource pool-name="__TimerPool" jndi-name="jdbc/__TimerPool" object-type="system-admin"></jdbc-resource>
+    <jdbc-resource pool-name="DerbyPool" jndi-name="jdbc/__default"></jdbc-resource>
+    <jdbc-connection-pool datasource-classname="org.apache.derby.jdbc.EmbeddedXADataSource" res-type="javax.sql.XADataSource" name="__TimerPool">
+      <property name="databaseName" value="${com.sun.aas.instanceRoot}/lib/databases/ejbtimer"></property>
+      <property name="connectionAttributes" value=";create=true"></property>
     </jdbc-connection-pool>
-    <jdbc-resource pool-name="luciano" jndi-name="jdbc/luciano"></jdbc-resource>
-    <jdbc-connection-pool driver-classname="" datasource-classname="org.postgresql.xa.PGXADataSource" res-type="javax.sql.XADataSource" description="" name="postgresql">
-      <property name="portNumber" value="5432"></property>
-      <property name="databaseName" value="bd1"></property>
+    <jdbc-connection-pool is-isolation-level-guaranteed="false" datasource-classname="org.apache.derby.jdbc.ClientDataSource" res-type="javax.sql.DataSource" name="DerbyPool">
+      <property name="PortNumber" value="1527"></property>
+      <property name="Password" value="APP"></property>
+      <property name="User" value="APP"></property>
       <property name="serverName" value="localhost"></property>
-      <property name="user" value="postgres"></property>
-      <property name="password" value="postgres"></property>
+      <property name="DatabaseName" value="sun-appserv-samples"></property>
+      <property name="connectionAttributes" value=";create=true"></property>
     </jdbc-connection-pool>
-    <jdbc-resource pool-name="postgresql" description="" jndi-name="jdbc/postgresql"></jdbc-resource>
   </resources>
   <servers>
     <server name="server" config-ref="server-config">
-      <resource-ref ref="jdbc/luciano"></resource-ref>
-      <resource-ref ref="jdbc/postgresql"></resource-ref>
       <application-ref ref="__admingui" virtual-servers="__asadmin"></application-ref>
-      <application-ref ref="AuthenticationPrj01" virtual-servers="server"></application-ref>
+      <resource-ref ref="jdbc/__TimerPool"></resource-ref>
+      <resource-ref ref="jdbc/__default"></resource-ref>
     </server>
   </servers>
   <nodes>
diff --git a/impl/extension/servlet/src/test/resources/keyfile b/impl/extension/servlet/src/test/resources/keyfile
index b3ff301..1049bc9 100644
--- a/impl/extension/servlet/src/test/resources/keyfile
+++ b/impl/extension/servlet/src/test/resources/keyfile
@@ -1 +1 @@
-asdrubal;{SSHA256}xYbabe0zKCOUrsH4SNQ+MK75W7FxJujcDcAJ9iXruHm1uT5mn+yktw==;users
+demoiselle;{SSHA256}yuPqrU5lEMJR0I4qNaegEK9hd5afM0Yo3rnLgYY7Sw0MlUFhbj9EmQ==;users
--
libgit2 0.21.2