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/06 23:41:05 UTC
svn commit: r504344 - in
/incubator/openejb/trunk/openejb3/container/openejb-jee/src:
main/java/org/apache/openejb/jee/oejb2/ test/resources/
Author: dblevins
Date: Tue Feb 6 14:41:04 2007
New Revision: 504344
URL: http://svn.apache.org/viewvc?view=rev&rev=504344
Log:
Add jaxb persistence unit tree to GeronimoEjbJarType
Modified:
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/OpenejbJarType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
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=504344&r1=504343&r2=504344
==============================================================================
--- 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 Tue Feb 6 14:41:04 2007
@@ -26,6 +26,7 @@
import org.apache.openejb.jee.oejb2.ServiceRefType;
import org.apache.openejb.jee.oejb2.ResourceRefType;
import org.apache.openejb.jee.oejb2.ResourceEnvRefType;
+import org.apache.openejb.jee.jpa.unit.Persistence;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
@@ -49,7 +50,8 @@
"resourceEnvRef",
"messageDestination",
"security",
- "service"
+ "service",
+ "persistence"
})
public class GeronimoEjbJarType {
@@ -82,6 +84,9 @@
@XmlElementRef(name = "service", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2", type = JAXBElement.class)
protected List<JAXBElement<? extends AbstractServiceType>> service;
+ @XmlElementRef(name="persistence", namespace = "http://java.sun.com/xml/ns/persistence", type = Persistence.class)
+ protected List<Persistence> persistence;
+
/**
* Gets the value of the environment property.
*
@@ -276,5 +281,12 @@
service = new ArrayList<JAXBElement<? extends AbstractServiceType>>();
}
return this.service;
+ }
+
+ public List<Persistence> getPersistence() {
+ if (persistence == null){
+ persistence = new ArrayList<Persistence>();
+ }
+ return persistence;
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java?view=diff&rev=504344&r1=504343&r2=504344
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/OpenejbJarType.java Tue Feb 6 14:41:04 2007
@@ -258,4 +258,10 @@
return this.service;
}
+ public List<Persistence> getPersistence() {
+ if (persistence == null){
+ persistence = new ArrayList<Persistence>();
+ }
+ return persistence;
+ }
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml?view=diff&rev=504344&r1=504343&r2=504344
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-corrected.xml Tue Feb 6 14:41:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns5="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns6="http://java.sun.com/xml/ns/persistence" xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns5="http://java.sun.com/xml/ns/persistence" xmlns:ns6="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
<environment>
<moduleId>
<groupId>itests</groupId>
@@ -25,22 +25,10 @@
</dependency>
</dependencies>
</environment>
- <ns6:persistence version="1.0">
- <ns6:persistence-unit transaction-type="JTA" name="cmp">
- <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
- <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
- <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
- <ns6:mapping-file>META-INF/jpa.mapping.xml</ns6:mapping-file>
- <ns6:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns6:class>
- <ns6:exclude-unlisted-classes>false</ns6:exclude-unlisted-classes>
- </ns6:persistence-unit>
- <ns6:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
- <ns6:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns6:provider>
- <ns6:jta-data-source>?name=SystemDatasource</ns6:jta-data-source>
- <ns6:non-jta-data-source>?name=NoTxDatasource</ns6:non-jta-data-source>
- <ns6:class>org.apache.openejb.test.entity.Customer</ns6:class>
- </ns6:persistence-unit>
- </ns6:persistence>
+ <ns2:persistence-unit-ref>
+ <ns2:persistence-unit-ref-name>persistence/TestUnit</ns2:persistence-unit-ref-name>
+ <ns2:persistence-unit-name>openjpa-test-unit</ns2:persistence-unit-name>
+ </ns2:persistence-unit-ref>
<ns2:persistence-context-ref>
<ns2:persistence-context-ref-name>persistence/TestContext</ns2:persistence-context-ref-name>
<ns2:persistence-unit-name>openjpa-test-unit</ns2:persistence-unit-name>
@@ -101,4 +89,20 @@
<ns2:name>SystemDatasource</ns2:name>
</ns2:pattern>
</ns2:resource-ref>
+ <ns5:persistence version="1.0">
+ <ns5:persistence-unit transaction-type="JTA" name="cmp">
+ <ns5:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns5:provider>
+ <ns5:jta-data-source>?name=SystemDatasource</ns5:jta-data-source>
+ <ns5:non-jta-data-source>?name=NoTxDatasource</ns5:non-jta-data-source>
+ <ns5:mapping-file>META-INF/jpa.mapping.xml</ns5:mapping-file>
+ <ns5:class>org.apache.openejb.test.entity.cmp.BasicCmpBean</ns5:class>
+ <ns5:exclude-unlisted-classes>false</ns5:exclude-unlisted-classes>
+ </ns5:persistence-unit>
+ <ns5:persistence-unit transaction-type="JTA" name="openjpa-test-unit">
+ <ns5:provider>org.apache.openjpa.persistence.PersistenceProviderImpl</ns5:provider>
+ <ns5:jta-data-source>?name=SystemDatasource</ns5:jta-data-source>
+ <ns5:non-jta-data-source>?name=NoTxDatasource</ns5:non-jta-data-source>
+ <ns5:class>org.apache.openejb.test.entity.Customer</ns5:class>
+ </ns5:persistence-unit>
+ </ns5:persistence>
</ns7:ejb-jar>
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml?view=diff&rev=504344&r1=504343&r2=504344
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-full.xml Tue Feb 6 14:41:04 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns5="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns6="http://java.sun.com/xml/ns/persistence" xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
+<ns7:ejb-jar xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:ns5="http://java.sun.com/xml/ns/persistence" xmlns:ns6="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:ns7="http://geronimo.apache.org/xml/ns/j2ee/ejb/openejb-2.0">
<environment>
<moduleId>
<groupId>String</groupId>