[jboss-cvs] JBossAS SVN: r111062 - in projects/jboss-jca/trunk/doc/samples/helloworld/src: test/java/org/jboss/jca/samples/helloworld and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-03-29 09:39:19 -0400 (Tue, 29 Mar 2011)
New Revision: 111062

Modified:
   projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnection.java
   projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionImpl.java
   projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnection.java
   projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
Log:
Add ConnectionEvent to HelloWorld sample

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnection.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnection.java	2011-03-29 10:06:23 UTC (rev 111061)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnection.java	2011-03-29 13:39:19 UTC (rev 111062)
@@ -40,4 +40,9 @@
     * @return String
     */
    public String helloWorld(String name);
+
+   /**
+    * Close
+    */
+   public void close();
 }

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionImpl.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionImpl.java	2011-03-29 10:06:23 UTC (rev 111061)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldConnectionImpl.java	2011-03-29 13:39:19 UTC (rev 111062)
@@ -33,15 +33,21 @@
    /** The logger */
    private static Logger log = Logger.getLogger("HelloWorldConnectionImpl");
 
+   /** ManagedConnection */
+   private HelloWorldManagedConnection mc;
+
    /** ManagedConnectionFactory */
    private HelloWorldManagedConnectionFactory mcf;
 
    /**
     * Default constructor
+    * @param mc HelloWorldManagedConnection
     * @param mcf HelloWorldManagedConnectionFactory
     */
-   public HelloWorldConnectionImpl(HelloWorldManagedConnectionFactory mcf)
+   public HelloWorldConnectionImpl(HelloWorldManagedConnection mc,
+                                   HelloWorldManagedConnectionFactory mcf)
    {
+      this.mc = mc;
       this.mcf = mcf;
    }
 
@@ -63,4 +69,12 @@
    {
       return "Hello World, " + name + " !";
    }
+
+   /**
+    * Close
+    */
+   public void close()
+   {
+      mc.closeHandle(this);
+   }
 }

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnection.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnection.java	2011-03-29 10:06:23 UTC (rev 111061)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/main/java/org/jboss/jca/samples/helloworld/HelloWorldManagedConnection.java	2011-03-29 13:39:19 UTC (rev 111062)
@@ -28,6 +28,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;
@@ -84,7 +85,7 @@
                                ConnectionRequestInfo cxRequestInfo) 
       throws ResourceException
    {
-      connection = new HelloWorldConnectionImpl(mcf);
+      connection = new HelloWorldConnectionImpl(this, mcf);
 
       return connection;
    }
@@ -204,4 +205,19 @@
    {
       return new HelloWorldManagedConnectionMetaData();
    }
+
+   /**
+    * Close handle
+    * @param handle The handle
+    */
+   void closeHandle(HelloWorldConnection handle)
+   {
+      ConnectionEvent event = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
+      event.setConnectionHandle(handle);
+
+      for (ConnectionEventListener cel : listeners)
+      {
+         cel.connectionClosed(event);
+      }
+   }
 }

Modified: projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java
===================================================================
--- projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java	2011-03-29 10:06:23 UTC (rev 111061)
+++ projects/jboss-jca/trunk/doc/samples/helloworld/src/test/java/org/jboss/jca/samples/helloworld/ConnectorTestCase.java	2011-03-29 13:39:19 UTC (rev 111062)
@@ -91,6 +91,7 @@
       HelloWorldConnection connection = connectionFactory.getConnection();
       assertNotNull(connection);
       String result = connection.helloWorld();
+      connection.close();
    }
 
    /**
@@ -105,7 +106,6 @@
       HelloWorldConnection connection = connectionFactory.getConnection();
       assertNotNull(connection);
       String result = connection.helloWorld(null);
+      connection.close();
    }
-
-
 }