[jboss-cvs] JBossAS SVN: r110865 - in projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth: ra/cri and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Mar 9 13:22:19 EST 2011


Author: jesper.pedersen
Date: 2011-03-09 13:22:19 -0500 (Wed, 09 Mar 2011)
New Revision: 110865

Modified:
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/CRITestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/SubjectTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnection.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnectionImpl.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthManagedConnection.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthSocket.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnection.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactory.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactoryImpl.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionImpl.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthManagedConnection.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthSocket.java
Log:
[JBJCA-94] Update test cases

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/CRITestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/CRITestCase.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/CRITestCase.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -78,12 +78,6 @@
       URL deployment = null;
       try
       {
-         reauthServer = new ReauthServer();
-         reauthServer.setHostName(host);
-         reauthServer.setPort(port);
-         reauthServer.setMaxConnections(1);
-         reauthServer.start();
-
          deployment = CRITestCase.class.getClassLoader().getResource("reauth-cri.rar");
 
          embedded.deploy(deployment);
@@ -104,6 +98,8 @@
          assertEquals(user, rc.getAuth());
 
          assertTrue(rc.logout());
+
+         rc.close();
       }
       finally
       {
@@ -112,12 +108,67 @@
             embedded.undeploy(deployment);
          }
 
-         if (reauthServer != null)
+         if (context != null)
          {
-            reauthServer.stop();
-            reauthServer = null;
+            context.close();
          }
+      }
+   }
 
+   /**
+    * Two users using the same managed connection in turn
+    * @throws Throwable throwable exception 
+    */
+   @Test
+   public void testTwoUsers() throws Throwable
+   {
+      Context context = null;
+      URL deployment = null;
+      try
+      {
+         deployment = CRITestCase.class.getClassLoader().getResource("reauth-cri.rar");
+
+         embedded.deploy(deployment);
+
+         context = new InitialContext();
+
+         ReauthConnectionFactory rcf = (ReauthConnectionFactory)context.lookup("java:/eis/Reauth");
+
+         assertNotNull(rcf);
+
+         String user1 = "user1";
+         String password1 = "password1";
+
+         ReauthConnection rc1 = rcf.getConnection(user1, password1);
+
+         assertNotNull(rc1);
+
+         assertEquals(user1, rc1.getAuth());
+
+         assertTrue(rc1.logout());
+         
+         rc1.close();
+
+         String user2 = "user2";
+         String password2 = "password2";
+
+         ReauthConnection rc2 = rcf.getConnection(user2, password2);
+
+         assertNotNull(rc2);
+
+         assertEquals(user2, rc2.getAuth());
+
+         assertTrue(rc2.logout());
+
+         rc2.close();
+      }
+      finally
+      {
+         if (deployment != null)
+         {
+            embedded.undeploy(deployment);
+         }
+
          if (context != null)
          {
             context.close();
@@ -136,6 +187,12 @@
    @Before
    public void before() throws Throwable
    {
+      reauthServer = new ReauthServer();
+      reauthServer.setHostName(host);
+      reauthServer.setPort(port);
+      reauthServer.setMaxConnections(1);
+      reauthServer.start();
+
       embedded = EmbeddedFactory.create(true);
       embedded.startup();
    }
@@ -147,7 +204,16 @@
    @After
    public void after() throws Throwable
    {
-      embedded.shutdown();
-      embedded = null;
+      if (embedded != null)
+      {
+         embedded.shutdown();
+         embedded = null;
+      }
+
+      if (reauthServer != null)
+      {
+         reauthServer.stop();
+         reauthServer = null;
+      }
    }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/SubjectTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/SubjectTestCase.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/SubjectTestCase.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -22,6 +22,7 @@
 
 package org.jboss.jca.core.security.reauth;
 
+import org.jboss.jca.core.security.DefaultSubjectFactory;
 import org.jboss.jca.core.security.reauth.eis.ReauthServer;
 import org.jboss.jca.core.security.reauth.ra.subject.ReauthConnection;
 import org.jboss.jca.core.security.reauth.ra.subject.ReauthConnectionFactory;
@@ -56,6 +57,7 @@
    private static Logger log = Logger.getLogger(SubjectTestCase.class);
 
    private static Embedded embedded;
+   private static DefaultSubjectFactory subjectFactory;
 
    // EIS server
    private static String host = "localhost";
@@ -78,12 +80,6 @@
       URL deployment = null;
       try
       {
-         reauthServer = new ReauthServer();
-         reauthServer.setHostName(host);
-         reauthServer.setPort(port);
-         reauthServer.setMaxConnections(1);
-         reauthServer.start();
-
          deployment = SubjectTestCase.class.getClassLoader().getResource("reauth-subject.rar");
 
          embedded.deploy(deployment);
@@ -93,17 +89,22 @@
          String user = "user";
          String password = "password";
 
+         subjectFactory.setUserName(user);
+         subjectFactory.setPassword(password);
+
          ReauthConnectionFactory rcf = (ReauthConnectionFactory)context.lookup("java:/eis/Reauth");
 
          assertNotNull(rcf);
 
-         ReauthConnection rc = rcf.getConnection(user, password);
+         ReauthConnection rc = rcf.getConnection();
 
          assertNotNull(rc);
 
          assertEquals(user, rc.getAuth());
 
          assertTrue(rc.logout());
+
+         rc.close();
       }
       finally
       {
@@ -112,12 +113,73 @@
             embedded.undeploy(deployment);
          }
 
-         if (reauthServer != null)
+         if (context != null)
          {
-            reauthServer.stop();
-            reauthServer = null;
+            context.close();
          }
+      }
+   }
 
+   /**
+    * Two users using the same managed connection in turn
+    * @throws Throwable throwable exception 
+    */
+   @Test
+   public void testTwoUsers() throws Throwable
+   {
+      Context context = null;
+      URL deployment = null;
+      try
+      {
+         deployment = SubjectTestCase.class.getClassLoader().getResource("reauth-subject.rar");
+
+         embedded.deploy(deployment);
+
+         context = new InitialContext();
+
+         ReauthConnectionFactory rcf = (ReauthConnectionFactory)context.lookup("java:/eis/Reauth");
+
+         assertNotNull(rcf);
+
+         String user1 = "user1";
+         String password1 = "password1";
+
+         subjectFactory.setUserName(user1);
+         subjectFactory.setPassword(password1);
+
+         ReauthConnection rc1 = rcf.getConnection();
+
+         assertNotNull(rc1);
+
+         assertEquals(user1, rc1.getAuth());
+
+         assertTrue(rc1.logout());
+         
+         rc1.close();
+
+         String user2 = "user2";
+         String password2 = "password2";
+
+         subjectFactory.setUserName(user2);
+         subjectFactory.setPassword(password2);
+
+         ReauthConnection rc2 = rcf.getConnection();
+
+         assertNotNull(rc2);
+
+         assertEquals(user2, rc2.getAuth());
+
+         assertTrue(rc2.logout());
+
+         rc2.close();
+      }
+      finally
+      {
+         if (deployment != null)
+         {
+            embedded.undeploy(deployment);
+         }
+
          if (context != null)
          {
             context.close();
@@ -136,8 +198,17 @@
    @Before
    public void before() throws Throwable
    {
+      reauthServer = new ReauthServer();
+      reauthServer.setHostName(host);
+      reauthServer.setPort(port);
+      reauthServer.setMaxConnections(1);
+      reauthServer.start();
+      
       embedded = EmbeddedFactory.create(true);
       embedded.startup();
+
+      subjectFactory = embedded.lookup("DefaultSecurityDomain", DefaultSubjectFactory.class);
+      assertNotNull(subjectFactory);
    }
 
    /**
@@ -147,7 +218,16 @@
    @After
    public void after() throws Throwable
    {
-      embedded.shutdown();
-      embedded = null;
+      if (embedded != null)
+      {
+         embedded.shutdown();
+         embedded = null;
+      }
+
+      if (reauthServer != null)
+      {
+         reauthServer.stop();
+         reauthServer = null;
+      }
    }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnection.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnection.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnection.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -52,4 +52,9 @@
     * @throws ResourceException Thrown if an error occurs
     */
    public String getAuth() throws ResourceException;
+
+   /**
+    * Close
+    */
+   public void close();
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnectionImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnectionImpl.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthConnectionImpl.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -35,23 +35,23 @@
    /** The logger */
    private static Logger log = Logger.getLogger(ReauthConnectionImpl.class);
 
-   /** The reauth socket */
-   private ReauthSocket socket;
+   /** The reauth managed connection */
+   private ReauthManagedConnection mc;
 
    /** The CRI */
    private ReauthCri cri;
 
    /**
     * Constructor
-    * @param socket The socket
+    * @param mc The managed connection
     * @param cri ConnectionRequestInfo instance
     * @exception ResourceException Thrown if an error occurs
     */
-   public ReauthConnectionImpl(ReauthSocket socket, ReauthCri cri) throws ResourceException
+   public ReauthConnectionImpl(ReauthManagedConnection mc, ReauthCri cri) throws ResourceException
    {
-      log.tracef("constructor(%s, %s)", socket, cri);
+      log.tracef("constructor(%s, %s)", mc, cri);
 
-      this.socket = socket;
+      this.mc = mc;
       this.cri = cri;
    }
 
@@ -66,7 +66,7 @@
    {
       log.tracef("login(%s, %s)", username, password);
 
-      return socket.login(username, password);
+      return mc.getSocket().login(username, password);
    }
 
    /**
@@ -78,7 +78,7 @@
    {
       log.tracef("logout()");
 
-      return socket.logout();
+      return mc.getSocket().logout();
    }
 
    /**
@@ -90,10 +90,18 @@
    {
       log.tracef("getAuth()");
 
-      return socket.getAuth();
+      return mc.getSocket().getAuth();
    }
 
    /**
+    * Close
+    */
+   public void close()
+   {
+      mc.closeHandle(this);
+   }
+
+   /**
     * Get the CRI
     * @return The value
     */

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthManagedConnection.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthManagedConnection.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -27,6 +27,7 @@
 
 import javax.resource.NotSupportedException;
 import javax.resource.ResourceException;
+import javax.resource.spi.ConnectionEvent;
 import javax.resource.spi.ConnectionEventListener;
 import javax.resource.spi.ConnectionRequestInfo;
 import javax.resource.spi.LocalTransaction;
@@ -69,6 +70,8 @@
     */
    public ReauthManagedConnection(ReauthManagedConnectionFactory mcf) throws ResourceException
    {
+      log.tracef("constructor(%s)", mcf);
+
       this.mcf = mcf;
       this.listeners = new HashSet<ConnectionEventListener>(1);
       this.logwriter = null;
@@ -104,16 +107,21 @@
 
       if (connection == null)
       {
-         connection = new ReauthConnectionImpl(socket, cri);
+         connection = new ReauthConnectionImpl(this, cri);
+         log.debugf("Creating a new connection: %s", connection);
       }
       else
       {
          if (connection.getCri().getUserName().equals(cri.getUserName()))
+         {
+            log.debugf("Existing connection has same credentials: %s", cri.getUserName());
             auth = false;
+         }
       }
 
       if (auth)
       {
+         log.debugf("Auth connection: %s", cri.getUserName());
          connection.login(cri.getUserName(), cri.getPassword());
       }
 
@@ -146,8 +154,6 @@
    {
       log.tracef("cleanup");
 
-      // TODO - connection listeners
-
       socket.cleanup();
    }
 
@@ -171,7 +177,8 @@
     */
    public void addConnectionEventListener(ConnectionEventListener listener)
    {
-      log.tracef("addConnectionEventListener");
+      log.tracef("addConnectionEventListener(%s)", listener);
+
       listeners.add(listener);
    }
 
@@ -182,7 +189,8 @@
     */
    public void removeConnectionEventListener(ConnectionEventListener listener)
    {
-      log.tracef("removeConnectionEventListener");
+      log.tracef("removeConnectionEventListener(%s)", listener);
+
       listeners.remove(listener);
    }
 
@@ -248,4 +256,30 @@
 
       return new ReauthManagedConnectionMetaData(socket);
    }
+
+   /**
+    * Get the socket
+    * @return The value
+    */
+   ReauthSocket getSocket()
+   {
+      return socket;
+   }
+
+   /**
+    * Close handle
+    * @param handle The handle
+    */
+   void closeHandle(ReauthConnection handle)
+   {
+      log.tracef("closeHandle(%s)", handle);      
+
+      ConnectionEvent event = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+      event.setConnectionHandle(handle);
+
+      for (ConnectionEventListener cel : listeners)
+      {
+         cel.connectionClosed(event);
+      }
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthSocket.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthSocket.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/cri/ReauthSocket.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -192,7 +192,16 @@
          getOutput().writeByte(4);
          getOutput().flush();
 
-         socket.close();
+         Boolean result = (Boolean)getInput().readObject();
+
+         if (result.booleanValue())
+         {
+            log.debugf("Unauth successful");
+         }
+         else
+         {
+            log.debugf("Unauth unsuccessful");
+         }
       }
       catch (Throwable t)
       {

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnection.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnection.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnection.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -31,15 +31,6 @@
 public interface ReauthConnection
 {
    /**
-    * login
-    * @param username username
-    * @param password password
-    * @return String
-    * @throws ResourceException Thrown if an error occurs
-    */
-   public String login(String username, String password) throws ResourceException;
-
-   /**
     * logout
     * @return boolean
     * @throws ResourceException Thrown if an error occurs
@@ -52,4 +43,9 @@
     * @throws ResourceException Thrown if an error occurs
     */
    public String getAuth() throws ResourceException;
+
+   /**
+    * Close
+    */
+   public void close();
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactory.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactory.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -36,10 +36,8 @@
    /** 
     * Get connection from factory
     *
-    * @param userName The user name
-    * @param password The password
     * @return ReauthConnection instance
     * @exception ResourceException Thrown if a connection can't be obtained
     */
-   public ReauthConnection getConnection(String userName, String password) throws ResourceException;
+   public ReauthConnection getConnection() throws ResourceException;
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactoryImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactoryImpl.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionFactoryImpl.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -68,13 +68,11 @@
    /** 
     * Get connection from factory
     *
-    * @param userName The user name
-    * @param password The password
     * @return ReauthConnection instance
     * @exception ResourceException Thrown if a connection can't be obtained
     */
    @Override
-   public ReauthConnection getConnection(String userName, String password) throws ResourceException
+   public ReauthConnection getConnection() throws ResourceException
    {
       log.tracef("getConnection()");
 

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionImpl.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthConnectionImpl.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -35,8 +35,8 @@
    /** The logger */
    private static Logger log = Logger.getLogger(ReauthConnectionImpl.class);
 
-   /** The reauth socket */
-   private ReauthSocket socket;
+   /** The reauth managed connection */
+   private ReauthManagedConnection mc;
 
    /** The user name */
    private String userName;
@@ -46,16 +46,16 @@
 
    /**
     * Constructor
-    * @param socket The socket
+    * @param mc The managed connection
     * @param userName The user name
     * @param password The password
     * @exception ResourceException Thrown if an error occurs
     */
-   public ReauthConnectionImpl(ReauthSocket socket, String userName, String password) throws ResourceException
+   public ReauthConnectionImpl(ReauthManagedConnection mc, String userName, String password) throws ResourceException
    {
-      log.tracef("constructor(%s, %s, %s)", socket, userName, password);
+      log.tracef("constructor(%s, %s, %s)", mc, userName, password);
 
-      this.socket = socket;
+      this.mc = mc;
       this.userName = userName;
       this.password = password;
    }
@@ -67,11 +67,11 @@
     * @return String
     * @exception ResourceException Thrown if an error occurs
     */
-   public String login(String username, String password) throws ResourceException
+   String login(String username, String password) throws ResourceException
    {
       log.tracef("login(%s, %s)", username, password);
 
-      return socket.login(username, password);
+      return mc.getSocket().login(username, password);
    }
 
    /**
@@ -83,7 +83,7 @@
    {
       log.tracef("logout()");
 
-      return socket.logout();
+      return mc.getSocket().logout();
    }
 
    /**
@@ -95,10 +95,18 @@
    {
       log.tracef("getAuth()");
 
-      return socket.getAuth();
+      return mc.getSocket().getAuth();
    }
 
    /**
+    * Close
+    */
+   public void close()
+   {
+      mc.closeHandle(this);
+   }
+
+   /**
     * Get the user name
     * @return The value
     */

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthManagedConnection.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthManagedConnection.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -27,6 +27,7 @@
 
 import javax.resource.NotSupportedException;
 import javax.resource.ResourceException;
+import javax.resource.spi.ConnectionEvent;
 import javax.resource.spi.ConnectionEventListener;
 import javax.resource.spi.ConnectionRequestInfo;
 import javax.resource.spi.LocalTransaction;
@@ -70,6 +71,8 @@
     */
    public ReauthManagedConnection(ReauthManagedConnectionFactory mcf) throws ResourceException
    {
+      log.tracef("constructor(%s)", mcf);
+
       this.mcf = mcf;
       this.listeners = new HashSet<ConnectionEventListener>(1);
       this.logwriter = null;
@@ -107,7 +110,7 @@
 
       if (connection == null)
       {
-         connection = new ReauthConnectionImpl(socket, pc.getUserName(), new String(pc.getPassword()));
+         connection = new ReauthConnectionImpl(this, pc.getUserName(), new String(pc.getPassword()));
       }
       else
       {
@@ -149,8 +152,6 @@
    {
       log.tracef("cleanup");
 
-      // TODO - connection listeners
-
       socket.cleanup();
    }
 
@@ -174,7 +175,8 @@
     */
    public void addConnectionEventListener(ConnectionEventListener listener)
    {
-      log.tracef("addConnectionEventListener");
+      log.tracef("addConnectionEventListener(%s)", listener);
+
       listeners.add(listener);
    }
 
@@ -185,7 +187,8 @@
     */
    public void removeConnectionEventListener(ConnectionEventListener listener)
    {
-      log.tracef("removeConnectionEventListener");
+      log.tracef("removeConnectionEventListener(%s)", listener);
+
       listeners.remove(listener);
    }
 
@@ -251,4 +254,30 @@
 
       return new ReauthManagedConnectionMetaData(socket);
    }
+
+   /**
+    * Get the socket
+    * @return The value
+    */
+   ReauthSocket getSocket()
+   {
+      return socket;
+   }
+
+   /**
+    * Close handle
+    * @param handle The handle
+    */
+   void closeHandle(ReauthConnection handle)
+   {
+      log.tracef("closeHandle(%s)", handle);      
+
+      ConnectionEvent event = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+      event.setConnectionHandle(handle);
+
+      for (ConnectionEventListener cel : listeners)
+      {
+         cel.connectionClosed(event);
+      }
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthSocket.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthSocket.java	2011-03-09 12:18:53 UTC (rev 110864)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/security/reauth/ra/subject/ReauthSocket.java	2011-03-09 18:22:19 UTC (rev 110865)
@@ -192,7 +192,16 @@
          getOutput().writeByte(4);
          getOutput().flush();
 
-         socket.close();
+         Boolean result = (Boolean)getInput().readObject();
+
+         if (result.booleanValue())
+         {
+            log.debugf("Unauth successful");
+         }
+         else
+         {
+            log.debugf("Unauth unsuccessful");
+         }
       }
       catch (Throwable t)
       {



More information about the jboss-cvs-commits mailing list