[jboss-cvs] JBossAS SVN: r112503 - in projects/jboss-jca/trunk/core/src: main/java/org/jboss/jca/core/connectionmanager and 2 other directories.

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

Author: jesper.pedersen
Date: 2011-12-06 09:27:04 -0500 (Tue, 06 Dec 2011)
New Revision: 112503

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ConnectionManager.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
Log:
[JBJCA-711] ConnectionManager violates Serializable contract

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ConnectionManager.java	2011-12-05 04:54:07 UTC (rev 112502)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/ConnectionManager.java	2011-12-06 14:27:04 UTC (rev 112503)
@@ -30,7 +30,7 @@
  * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
  * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
  */
-public interface ConnectionManager extends javax.resource.spi.ConnectionManager, java.io.Serializable
+public interface ConnectionManager extends javax.resource.spi.ConnectionManager
 {
    /**
     * Kill given connection listener wrapped connection instance.

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-12-05 04:54:07 UTC (rev 112502)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-12-06 14:27:04 UTC (rev 112503)
@@ -31,11 +31,6 @@
 import org.jboss.jca.core.connectionmanager.pool.api.Pool;
 import org.jboss.jca.core.spi.transaction.TransactionIntegration;
 
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -689,34 +684,4 @@
 
       return subject;
    }
-
-   /**
-    * Write the object to the stream -- THIS IS NOT SUPPORTED
-    * @param out The stream
-    * @exception IOException Thrown in case of an error
-    */
-   private void writeObject(ObjectOutputStream out) throws IOException
-   {
-      throw new IOException(bundle.thisMethodNotSupported());
-   }
-
-   /**
-    * Read the object from the stream -- THIS IS NOT SUPPORTED
-    * @param in The stream
-    * @exception IOException Thrown in case of an error
-    * @exception ClassNotFoundException Thrown if a class can't be resolved
-    */
-   private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
-   {
-      throw new IOException(bundle.thisMethodNotSupported());
-   }
-
-   /**
-    * Read the object -- THIS IS NOT SUPPORTED
-    * @exception ObjectStreamException Thrown in case of an error
-    */
-   private void readObjectNoData() throws ObjectStreamException
-   {
-      throw new NotSerializableException(bundle.thisMethodNotSupported());
-   }
 }

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java	2011-12-05 04:54:07 UTC (rev 112502)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java	2011-12-06 14:27:04 UTC (rev 112503)
@@ -39,22 +39,24 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.Ignore;
 
 
 import static org.junit.Assert.*;
 
 /**
  * Serializable test of the transaction connection manager
+ *
+ * We need this in IronJacamar 2.0
  * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
  */
+ at Ignore
 public class SerializableTestCase
 {
    /**
     * testSerializable.
     * @throws Throwable for exception
     */
-   @Test(expected = IOException.class)
    public void testSerializable() throws Throwable
    {
       ManagedConnectionFactory mcf = new MockManagedConnectionFactory();

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java	2011-12-05 04:54:07 UTC (rev 112502)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java	2011-12-06 14:27:04 UTC (rev 112503)
@@ -43,14 +43,17 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.Ignore;
 
 import static org.junit.Assert.assertNotNull;
 
 /**
  * Serializable test of the transaction connection manager
+ *
+ * We need this in IronJacamar 2.0
  * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
  */
+ at Ignore
 public class SerializableTestCase
 {
    /**Embedded JCA*/
@@ -60,7 +63,6 @@
     * testSerializable.
     * @throws Throwable for exception
     */
-   @Test(expected = IOException.class)
    public void testSerializable() throws Throwable
    {
       TransactionIntegration ti = embedded.lookup("TransactionIntegration", TransactionIntegration.class);