svn commit: r603833 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/PersistenceContextReferenceInfo.java assembler/classic/PersistenceUnitReferenceInfo.java config/JndiEncInfoBuilder.java

[dblevins]

Author: dblevins
Date: Wed Dec 12 22:17:08 2007
New Revision: 603833

URL: http://svn.apache.org/viewvc?rev=603833&view=rev
Log:
Added unitId as an attribute to match similar resourceId concecpt for resource 
refs

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceContextReferenceInfo.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitReferenceInfo.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceContextReferenceInfo.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceContextReferenceInfo.java?rev=603833&r1=603832&r2=603833&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceContextReferenceInfo.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceContextReferenceInfo.java
 Wed Dec 12 22:17:08 2007
@@ -25,6 +25,7 @@
 public class PersistenceContextReferenceInfo extends InjectableInfo {
     public String referenceName;
     public String persistenceUnitName;
+    public String unitId;
     public boolean extended;
     public final Properties properties = new Properties();
 

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitReferenceInfo.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitReferenceInfo.java?rev=603833&r1=603832&r2=603833&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitReferenceInfo.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceUnitReferenceInfo.java
 Wed Dec 12 22:17:08 2007
@@ -22,6 +22,7 @@
 public class PersistenceUnitReferenceInfo extends InjectableInfo {
     public String referenceName;
     public String persistenceUnitName;
+    public String unitId;
 
     public ReferenceLocationInfo location;
 }

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=603833&r1=603832&r2=603833&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
 Wed Dec 12 22:17:08 2007
@@ -185,6 +185,7 @@
             PersistenceUnitReferenceInfo info = new 
PersistenceUnitReferenceInfo();
             info.referenceName = puRef.getPersistenceUnitRefName();
             info.persistenceUnitName = puRef.getPersistenceUnitName();
+            info.unitId = puRef.getMappedName();
             info.location = buildLocationInfo(puRef);
             info.targets.addAll(buildInjectionInfos(puRef));
             infos.add(info);
@@ -199,6 +200,7 @@
             PersistenceContextReferenceInfo info = new 
PersistenceContextReferenceInfo();
             info.referenceName = contextRef.getPersistenceContextRefName();
             info.persistenceUnitName = contextRef.getPersistenceUnitName();
+            info.unitId = contextRef.getMappedName();
             info.location = buildLocationInfo(contextRef);
             info.extended = (contextRef.getPersistenceContextType() == 
PersistenceContextType.EXTENDED);
             List<Property> persistenceProperty = 
contextRef.getPersistenceProperty();