[jboss-cvs] JBossAS SVN: r109678 - projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard.

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

Author: smarlow at redhat.com
Date: 2010-12-02 18:22:55 -0500 (Thu, 02 Dec 2010)
New Revision: 109678

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextRefResource.java
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextResourceProvider.java
Log:
JBJPA-33

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextRefResource.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextRefResource.java	2010-12-02 23:12:41 UTC (rev 109677)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextRefResource.java	2010-12-02 23:22:55 UTC (rev 109678)
@@ -24,8 +24,11 @@
 import org.jboss.jpa.deployment.ManagedEntityManagerFactory;
 import org.jboss.jpa.deployment.PersistenceUnitDeployment;
 import org.jboss.jpa.spi.PersistenceUnitRegistry;
+import org.jboss.switchboard.javaee.environment.PersistenceContextRefType;
 import org.jboss.switchboard.spi.Resource;
 
+import javax.persistence.PersistenceContextType;
+
 /**
  *
  * <p>
@@ -38,16 +41,16 @@
 {
 
    private final String puSupplier;
-   private final boolean pcExtendedType;
+   private final PersistenceContextRefType pcRef;
 
-   public PersistenceContextRefResource(String puSupplier, boolean pcExtendedType)
+   public PersistenceContextRefResource(String puSupplier, PersistenceContextRefType pcRef)
    {
       if (puSupplier == null)
       {
          throw new IllegalArgumentException("Cannot create a PersistenceUnitRefResource for a null persistence unit supplier");
       }
       this.puSupplier = puSupplier;
-      this.pcExtendedType = pcExtendedType;
+      this.pcRef = pcRef;
    }
 
    @Override
@@ -61,7 +64,8 @@
    @Override
    public Object getTarget()
    {
-      if (pcExtendedType)
+      boolean extendedPc = PersistenceContextType.EXTENDED.equals(pcRef.getPersistenceContextType());
+      if (extendedPc)
       {
          // clearly this is wrong, since the non-extended case returns a factory that can be bound.
          // hmm, I wonder if the else case already has the knowledge to return a factory that later returns
@@ -78,6 +82,7 @@
    @Override
    public String toString()
    {
-      return PersistenceContextRefResource.class.getSimpleName() + (pcExtendedType?"(extendedPC)":"")+"[supplier=" + this.puSupplier + "]";
+      boolean extendedPc = PersistenceContextType.EXTENDED.equals(pcRef.getPersistenceContextType());
+      return PersistenceContextRefResource.class.getSimpleName() + (extendedPc?"(extendedPC)":"")+"[supplier=" + this.puSupplier + "]";
    }
 }

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextResourceProvider.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextResourceProvider.java	2010-12-02 23:12:41 UTC (rev 109677)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/switchboard/PersistenceContextResourceProvider.java	2010-12-02 23:22:55 UTC (rev 109678)
@@ -77,7 +77,7 @@
          " in unit " + dependentDU + (extendedPc ? " (extended pc)":""));
       
       // create a PC ref resource
-      return new PersistenceContextRefResource(puSupplier, extendedPc);
+      return new PersistenceContextRefResource(puSupplier, pcRef);
    }
 
    @Override