[jboss-cvs] JBossAS SVN: r76424 - in projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx: instance/unit and 1 other directory.

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

Author: wolfc
Date: 2008-07-29 09:24:12 -0400 (Tue, 29 Jul 2008)
New Revision: 76424

Modified:
   projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/SimpleContainer.java
   projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/instance/unit/InstanceTestCase.java
Log:
Fixed constructor for JDK 6

Modified: projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/SimpleContainer.java
===================================================================
--- projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/SimpleContainer.java	2008-07-29 13:09:12 UTC (rev 76423)
+++ projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/SimpleContainer.java	2008-07-29 13:24:12 UTC (rev 76424)
@@ -27,20 +27,20 @@
  * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public class SimpleContainer
+public class SimpleContainer<T extends Object>
 {
    private String name;
    private String domainName;
-   private Class<Object> beanClass;
+   private Class<T> beanClass;
    
-   private StatefulContainer<Object> beanContainer;
+   private StatefulContainer<T> beanContainer;
    
    /**
     * @param name
     * @param domainName
     * @param beanClass
     */
-   public SimpleContainer(String name, String domainName, Class<Object> beanClass)
+   public SimpleContainer(String name, String domainName, Class<T> beanClass)
    {
       this.name = name;
       this.domainName = domainName;
@@ -54,7 +54,7 @@
    
    public void start()
    {
-      this.beanContainer = new StatefulContainer<Object>(name, domainName, beanClass);
+      this.beanContainer = new StatefulContainer<T>(name, domainName, beanClass);
    }
    
    public void stop()

Modified: projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/instance/unit/InstanceTestCase.java
===================================================================
--- projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/instance/unit/InstanceTestCase.java	2008-07-29 13:09:12 UTC (rev 76423)
+++ projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/instance/unit/InstanceTestCase.java	2008-07-29 13:24:12 UTC (rev 76424)
@@ -83,7 +83,7 @@
    @Test
    public void testInstance() throws Throwable
    {
-      SimpleContainer container = bootstrap.lookup("TestContainer", SimpleContainer.class);
+      SimpleContainer<?> container = bootstrap.lookup("TestContainer", SimpleContainer.class);
       
       InstanceTest bean = container.constructProxy(InstanceTest.class);
       
@@ -110,7 +110,7 @@
    @Test
    public void testTransactionMandatory() throws Throwable
    {
-      SimpleContainer container = bootstrap.lookup("TestContainer", SimpleContainer.class);
+      SimpleContainer<?> container = bootstrap.lookup("TestContainer", SimpleContainer.class);
       
       InstanceTest bean = container.constructProxy(InstanceTest.class);
       
@@ -130,7 +130,7 @@
    @Test
    public void testTransactionMandatoryIllegal() throws Throwable
    {
-      SimpleContainer container = bootstrap.lookup("TestContainer", SimpleContainer.class);
+      SimpleContainer<?> container = bootstrap.lookup("TestContainer", SimpleContainer.class);
       
       InstanceTest bean = container.constructProxy(InstanceTest.class);
       try