You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/05/26 02:23:30 UTC
svn commit: r948270 -
/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/
Author: djencks
Date: Wed May 26 00:23:29 2010
New Revision: 948270
URL: http://svn.apache.org/viewvc?rev=948270&view=rev
Log:
Add ee6 schema lookup-name support to jndi entries. No test yet
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiReference.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbLocalRef.java Wed May 26 00:23:29 2010
@@ -60,6 +60,7 @@ import java.util.List;
"local",
"ejbLink",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class EjbLocalRef implements EjbReference {
@@ -77,6 +78,8 @@ public class EjbLocalRef implements EjbR
protected String ejbLink;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -226,6 +229,14 @@ public class EjbLocalRef implements EjbR
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EjbRef.java Wed May 26 00:23:29 2010
@@ -62,6 +62,7 @@ import java.util.List;
"remote",
"ejbLink",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class EjbRef implements EjbReference {
@@ -78,6 +79,8 @@ public class EjbRef implements EjbRefere
protected String ejbLink;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -207,6 +210,14 @@ public class EjbRef implements EjbRefere
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/EnvEntry.java Wed May 26 00:23:29 2010
@@ -59,6 +59,7 @@ import java.util.List;
"envEntryType",
"envEntryValue",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class EnvEntry implements JndiReference {
@@ -76,6 +77,8 @@ public class EnvEntry implements JndiRef
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -160,6 +163,14 @@ public class EnvEntry implements JndiRef
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiReference.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiReference.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiReference.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/JndiReference.java Wed May 26 00:23:29 2010
@@ -29,4 +29,7 @@ public interface JndiReference extends I
String getMappedName();
void setMappedName(String mappedName);
+ String getLookupName();
+
+ void setLookupName(String lookupName);
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/MessageDestinationRef.java Wed May 26 00:23:29 2010
@@ -74,6 +74,7 @@ import java.util.List;
"messageDestinationUsage",
"messageDestinationLink",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class MessageDestinationRef implements JndiReference {
@@ -90,6 +91,8 @@ public class MessageDestinationRef imple
protected String messageDestinationLink;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -183,6 +186,14 @@ public class MessageDestinationRef imple
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceContextRef.java Wed May 26 00:23:29 2010
@@ -69,6 +69,7 @@ import java.util.List;
"persistenceContextType",
"persistenceProperty",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class PersistenceContextRef implements JndiReference, PersistenceRef {
@@ -85,6 +86,8 @@ public class PersistenceContextRef imple
protected List<Property> persistenceProperty;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -172,6 +175,14 @@ public class PersistenceContextRef imple
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/PersistenceUnitRef.java Wed May 26 00:23:29 2010
@@ -62,6 +62,7 @@ import java.util.List;
"persistenceUnitRefName",
"persistenceUnitName",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class PersistenceUnitRef implements JndiReference, PersistenceRef {
@@ -74,6 +75,8 @@ public class PersistenceUnitRef implemen
protected String persistenceUnitName;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -140,6 +143,14 @@ public class PersistenceUnitRef implemen
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceEnvRef.java Wed May 26 00:23:29 2010
@@ -65,6 +65,7 @@ import java.util.List;
"resourceEnvRefName",
"resourceEnvRefType",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class ResourceEnvRef implements JndiReference {
@@ -77,6 +78,8 @@ public class ResourceEnvRef implements J
protected String resourceEnvRefType;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -145,6 +148,14 @@ public class ResourceEnvRef implements J
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ResourceRef.java Wed May 26 00:23:29 2010
@@ -68,6 +68,7 @@ import java.util.List;
"resAuth",
"resSharingScope",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class ResourceRef implements JndiReference {
@@ -84,6 +85,8 @@ public class ResourceRef implements Jndi
protected ResSharingScope resSharingScope = ResSharingScope.SHAREABLE;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -176,6 +179,14 @@ public class ResourceRef implements Jndi
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java?rev=948270&r1=948269&r2=948270&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/ServiceRef.java Wed May 26 00:23:29 2010
@@ -55,6 +55,7 @@ import java.util.List;
"handler",
"handlerChains",
"mappedName",
+ "lookupName",
"injectionTarget"
})
public class ServiceRef implements JndiReference {
@@ -85,6 +86,8 @@ public class ServiceRef implements JndiR
protected HandlerChains handlerChains;
@XmlElement(name = "mapped-name")
protected String mappedName;
+ @XmlElement(name = "lookup-name")
+ protected String lookupName;
@XmlElement(name = "injection-target", required = true)
protected List<InjectionTarget> injectionTarget;
@XmlAttribute
@@ -229,6 +232,14 @@ public class ServiceRef implements JndiR
this.mappedName = value;
}
+ public String getLookupName() {
+ return lookupName;
+ }
+
+ public void setLookupName(String lookupName) {
+ this.lookupName = lookupName;
+ }
+
public List<InjectionTarget> getInjectionTarget() {
if (injectionTarget == null) {
injectionTarget = new ArrayList<InjectionTarget>();