You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/02/15 21:39:52 UTC
svn commit: r508135 - in
/incubator/openejb/trunk/openejb3/container/openejb-jee/src:
main/java/org/apache/openejb/jee/oejb2/ test/resources/
Author: dblevins
Date: Thu Feb 15 12:39:51 2007
New Revision: 508135
URL: http://svn.apache.org/viewvc?view=rev&rev=508135
Log:
no longer supports entity-manager-factory-ref, supports persistence-unit-ref instead as per the latest version of the naming-1.2 schema
Fixes OPENEJB-515
Added:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/PersistenceUnitRefType.java
- copied, changed from r506782, incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityManagerFactoryRefType.java
Removed:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityManagerFactoryRefType.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnterpriseBean.java Thu Feb 15 12:39:51 2007
@@ -17,8 +17,10 @@
package org.apache.openejb.jee.oejb2;
import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElement;
import java.lang.*;
import java.util.List;
+import java.util.ArrayList;
/**
* @version $Rev$ $Date$
@@ -33,6 +35,10 @@
List<String> getLocalJndiName();
List<JAXBElement<? extends AbstractNamingEntryType>> getAbstractNamingEntry();
+
+ List<PersistenceContextRefType> getPersistenceContextRef();
+
+ List<PersistenceUnitRefType> getPersistenceUnitRef();
List<EjbRefType> getEjbRef();
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityBeanType.java Thu Feb 15 12:39:51 2007
@@ -128,6 +128,8 @@
"selectForUpdate",
"cache",
"abstractNamingEntry",
+ "persistenceContextRef",
+ "persistenceUnitRef",
"ejbRef",
"ejbLocalRef",
"serviceRef",
@@ -179,6 +181,12 @@
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
+ @XmlElement(name = "persistence-contenxt-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceContextRefType> persistenceContextRef;
+
+ @XmlElement(name = "persistence-unit-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceUnitRefType> persistenceUnitRef;
+
@XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbRefType> ejbRef;
@@ -549,7 +557,7 @@
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link AbstractNamingEntryType }{@code >}
* {@link JAXBElement }{@code <}{@link PersistenceContextRefType }{@code >}
- * {@link JAXBElement }{@code <}{@link EntityManagerFactoryRefType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PersistenceUnitRefType }{@code >}
* {@link JAXBElement }{@code <}{@link GbeanRefType }{@code >}
*
*
@@ -559,6 +567,20 @@
abstractNamingEntry = new ArrayList<JAXBElement<? extends AbstractNamingEntryType>>();
}
return this.abstractNamingEntry;
+ }
+
+ public List<PersistenceContextRefType> getPersistenceContextRef() {
+ if (persistenceContextRef == null){
+ persistenceContextRef = new ArrayList<PersistenceContextRefType>();
+ }
+ return persistenceContextRef;
+ }
+
+ public List<PersistenceUnitRefType> getPersistenceUnitRef() {
+ if (persistenceUnitRef == null){
+ persistenceUnitRef = new ArrayList<PersistenceUnitRefType>();
+ }
+ return persistenceUnitRef;
}
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/GeronimoEjbJarType.java Thu Feb 15 12:39:51 2007
@@ -132,7 +132,7 @@
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link ResourceEnvRefType }{@code >}
* {@link JAXBElement }{@code <}{@link EjbRefType }{@code >}
- * {@link JAXBElement }{@code <}{@link org.apache.openejb.jee.oejb2.EntityManagerFactoryRefType }{@code >}
+ * {@link JAXBElement }{@code <}{@link org.apache.openejb.jee.oejb2.PersistenceUnitRefType }{@code >}
* {@link JAXBElement }{@code <}{@link org.apache.openejb.jee.oejb2.GbeanRefType }{@code >}
* {@link JAXBElement }{@code <}{@link EjbLocalRefType }{@code >}
* {@link JAXBElement }{@code <}{@link ResourceRefType }{@code >}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/JaxbOpenejbJar2.java Thu Feb 15 12:39:51 2007
@@ -18,6 +18,8 @@
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
@@ -37,8 +39,19 @@
*/
public class JaxbOpenejbJar2 {
+ private static final Map<Class,JAXBContext> contexts = new HashMap<Class,JAXBContext>();
+
+ private static JAXBContext getContext(Class type) throws JAXBException {
+ JAXBContext jaxbContext = contexts.get(type);
+ if (jaxbContext == null) {
+ jaxbContext = JAXBContext.newInstance(type);
+ contexts.put(type, jaxbContext);
+ }
+ return jaxbContext;
+ }
+
public static <T>String marshal(Class<T> type, Object object) throws JAXBException {
- JAXBContext ctx2 = JAXBContext.newInstance(type);
+ JAXBContext ctx2 = getContext(type);
Marshaller marshaller = ctx2.createMarshaller();
marshaller.setProperty("jaxb.formatted.output", true);
@@ -61,7 +74,7 @@
factory.setValidating(false);
SAXParser parser = factory.newSAXParser();
- JAXBContext ctx = JAXBContext.newInstance(type);
+ JAXBContext ctx = getContext(type);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
unmarshaller.setEventHandler(new ValidationEventHandler(){
public boolean handleEvent(ValidationEvent validationEvent) {
@@ -71,6 +84,7 @@
return false;
}
});
+
unmarshaller.setListener(new Unmarshaller.Listener(){
public void afterUnmarshal(Object object, Object object1) {
super.afterUnmarshal(object, object1);
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/MessageDrivenBeanType.java Thu Feb 15 12:39:51 2007
@@ -62,6 +62,8 @@
"resourceAdapter",
"activationConfig",
"abstractNamingEntry",
+ "persistenceContextRef",
+ "persistenceUnitRef",
"ejbRef",
"ejbLocalRef",
"serviceRef",
@@ -82,6 +84,12 @@
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
+ @XmlElement(name = "persistence-contenxt-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceContextRefType> persistenceContextRef;
+
+ @XmlElement(name = "persistence-unit-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceUnitRefType> persistenceUnitRef;
+
@XmlElement(name = "ejb-ref", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbRefType> ejbRef;
@@ -204,7 +212,7 @@
* Objects of the following type(s) are allowed in the list
* {@link JAXBElement }{@code <}{@link AbstractNamingEntryType }{@code >}
* {@link JAXBElement }{@code <}{@link PersistenceContextRefType }{@code >}
- * {@link JAXBElement }{@code <}{@link EntityManagerFactoryRefType }{@code >}
+ * {@link JAXBElement }{@code <}{@link PersistenceUnitRefType }{@code >}
* {@link JAXBElement }{@code <}{@link GbeanRefType }{@code >}
*
*
@@ -214,6 +222,21 @@
abstractNamingEntry = new ArrayList<JAXBElement<? extends AbstractNamingEntryType>>();
}
return this.abstractNamingEntry;
+ }
+
+
+ public List<PersistenceContextRefType> getPersistenceContextRef() {
+ if (persistenceContextRef == null){
+ persistenceContextRef = new ArrayList<PersistenceContextRefType>();
+ }
+ return persistenceContextRef;
+ }
+
+ public List<PersistenceUnitRefType> getPersistenceUnitRef() {
+ if (persistenceUnitRef == null){
+ persistenceUnitRef = new ArrayList<PersistenceUnitRefType>();
+ }
+ return persistenceUnitRef;
}
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ObjectFactory.java Thu Feb 15 12:39:51 2007
@@ -185,11 +185,11 @@
}
/**
- * Create an instance of {@link EntityManagerFactoryRefType }
+ * Create an instance of {@link PersistenceUnitRefType }
*
*/
- public EntityManagerFactoryRefType createEntityManagerFactoryRefType() {
- return new EntityManagerFactoryRefType();
+ public PersistenceUnitRefType createPersistenceUnitRefType() {
+ return new PersistenceUnitRefType();
}
/**
@@ -651,12 +651,12 @@
}
/**
- * Create an instance of {@link JAXBElement }{@code <}{@link EntityManagerFactoryRefType }{@code >}}
+ * Create an instance of {@link JAXBElement }{@code <}{@link PersistenceUnitRefType }{@code >}}
*
*/
@XmlElementDecl(namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", name = "entity-manager-factory-ref", substitutionHeadNamespace = "http://geronimo.apache.org/xml/ns/naming-1.2", substitutionHeadName = "abstract-naming-entry")
- public JAXBElement<EntityManagerFactoryRefType> createEntityManagerFactoryRef(EntityManagerFactoryRefType value) {
- return new JAXBElement<EntityManagerFactoryRefType>(_EntityManagerFactoryRef_QNAME, EntityManagerFactoryRefType.class, null, value);
+ public JAXBElement<PersistenceUnitRefType> createEntityManagerFactoryRef(PersistenceUnitRefType value) {
+ return new JAXBElement<PersistenceUnitRefType>(_EntityManagerFactoryRef_QNAME, PersistenceUnitRefType.class, null, value);
}
/**
Copied: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/PersistenceUnitRefType.java (from r506782, incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityManagerFactoryRefType.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/PersistenceUnitRefType.java?view=diff&rev=508135&p1=incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityManagerFactoryRefType.java&r1=506782&p2=incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/PersistenceUnitRefType.java&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EntityManagerFactoryRefType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/PersistenceUnitRefType.java Thu Feb 15 12:39:51 2007
@@ -23,41 +23,18 @@
import javax.xml.bind.annotation.XmlType;
-/**
- * <p>Java class for entity-manager-factory-refType complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="entity-manager-factory-refType">
- * <complexContent>
- * <extension base="{http://geronimo.apache.org/xml/ns/naming-1.2}abstract-naming-entryType">
- * <sequence>
- * <element name="entity-manager-factory-ref-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <choice>
- * <element name="persistence-unit-name" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * <element name="pattern" type="{http://geronimo.apache.org/xml/ns/naming-1.2}patternType"/>
- * </choice>
- * </sequence>
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "entity-manager-factory-refType", propOrder = {
- "entityManagerFactoryRefName",
+@XmlType(name = "persistence-unit-refType", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", propOrder = {
+ "persistenceUnitRefName",
"persistenceUnitName",
"pattern"
})
-public class EntityManagerFactoryRefType
+public class PersistenceUnitRefType
extends AbstractNamingEntryType
{
- @XmlElement(name = "entity-manager-factory-ref-name", required = true)
- protected String entityManagerFactoryRefName;
+ @XmlElement(name = "persistence-unit-ref-name", required = true)
+ protected String persistenceUnitRefName;
@XmlElement(name = "persistence-unit-name")
protected String persistenceUnitName;
protected PatternType pattern;
@@ -70,8 +47,8 @@
* {@link String }
*
*/
- public String getEntityManagerFactoryRefName() {
- return entityManagerFactoryRefName;
+ public String getPersistenceUnitRefName() {
+ return persistenceUnitRefName;
}
/**
@@ -82,8 +59,8 @@
* {@link String }
*
*/
- public void setEntityManagerFactoryRefName(String value) {
- this.entityManagerFactoryRefName = value;
+ public void setPersistenceUnitRefName(String value) {
+ this.persistenceUnitRefName = value;
}
/**
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/SessionBeanType.java Thu Feb 15 12:39:51 2007
@@ -68,6 +68,8 @@
"tssLink",
"tss",
"abstractNamingEntry",
+ "persistenceContextRef",
+ "persistenceUnitRef",
"ejbRef",
"ejbLocalRef",
"serviceRef",
@@ -95,6 +97,12 @@
@XmlElementRef(name = "abstract-naming-entry", namespace = "http://geronimo.apache.org/xml/ns/naming-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractNamingEntryType>> abstractNamingEntry;
+ @XmlElement(name = "persistence-contenxt-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceContextRefType> persistenceContextRef;
+
+ @XmlElement(name = "persistence-unit-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
+ protected List<PersistenceUnitRefType> persistenceUnitRef;
+
@XmlElement(name = "ejb-ref", namespace="http://geronimo.apache.org/xml/ns/naming-1.2")
protected List<EjbRefType> ejbRef;
@@ -283,6 +291,20 @@
abstractNamingEntry = new ArrayList<JAXBElement<? extends AbstractNamingEntryType>>();
}
return this.abstractNamingEntry;
+ }
+
+ public List<PersistenceContextRefType> getPersistenceContextRef() {
+ if (persistenceContextRef == null){
+ persistenceContextRef = new ArrayList<PersistenceContextRefType>();
+ }
+ return persistenceContextRef;
+ }
+
+ public List<PersistenceUnitRefType> getPersistenceUnitRef() {
+ if (persistenceUnitRef == null){
+ persistenceUnitRef = new ArrayList<PersistenceUnitRefType>();
+ }
+ return persistenceUnitRef;
}
public List<EjbRefType> getEjbRef() {
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml Thu Feb 15 12:39:51 2007
@@ -81,6 +81,14 @@
<ns2:value>String</ns2:value>
</ns2:property>
</ns2:persistence-context-ref>
+ <ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref-name>String</ns2:persistence-unit-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ </ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref-name>String</ns2:persistence-unit-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ </ns2:persistence-unit-ref>
<ns2:ejb-ref>
<ns2:ref-name>String</ns2:ref-name>
<ns2:pattern>
@@ -261,6 +269,14 @@
<ns2:value>String</ns2:value>
</ns2:property>
</ns2:persistence-context-ref>
+ <ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref-name>String</ns2:persistence-unit-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ </ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref-name>String</ns2:persistence-unit-ref-name>
+ <ns2:persistence-unit-name>String</ns2:persistence-unit-name>
+ </ns2:persistence-unit-ref>
<ns2:ejb-ref>
<ns2:ref-name>String</ns2:ref-name>
<ns2:pattern>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml?view=diff&rev=508135&r1=508134&r2=508135
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-invalid.xml Thu Feb 15 12:39:51 2007
@@ -84,6 +84,14 @@
<value>String</value>
</property>
</persistence-context-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>String</persistence-unit-ref-name>
+ <persistence-unit-name>String</persistence-unit-name>
+ </persistence-unit-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>String</persistence-unit-ref-name>
+ <persistence-unit-name>String</persistence-unit-name>
+ </persistence-unit-ref>
<ejb-ref>
<ref-name>String</ref-name>
<pattern>
@@ -264,6 +272,14 @@
<value>String</value>
</property>
</persistence-context-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>String</persistence-unit-ref-name>
+ <persistence-unit-name>String</persistence-unit-name>
+ </persistence-unit-ref>
+ <persistence-unit-ref>
+ <persistence-unit-ref-name>String</persistence-unit-ref-name>
+ <persistence-unit-name>String</persistence-unit-name>
+ </persistence-unit-ref>
<ejb-ref>
<ref-name>String</ref-name>
<pattern>