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/01/25 06:17:15 UTC
svn commit: r499666 - in /incubator/openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/persistence/
openejb-core/src/main/java/org/apache/openejb/persistence/dd/
openejb-core/src/test/java/org/apache/openejb/persistence/ op...
Author: dblevins
Date: Wed Jan 24 21:17:13 2007
New Revision: 499666
URL: http://svn.apache.org/viewvc?view=rev&rev=499666
Log:
Move persistence.xml jaxb tree in with the other jaxb trees
Added:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/
- copied from r499663, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/dd/
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/dd/
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Properties.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Property.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.java?view=diff&rev=499666&r1=499665&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.java Wed Jan 24 21:17:13 2007
@@ -16,9 +16,9 @@
*/
package org.apache.openejb.persistence;
-import org.apache.openejb.persistence.dd.JaxbPersistenceFactory;
-import org.apache.openejb.persistence.dd.PersistenceUnit;
-import org.apache.openejb.persistence.dd.TransactionType;
+import org.apache.openejb.jee.jpa.unit.JaxbPersistenceFactory;
+import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
+import org.apache.openejb.jee.jpa.unit.TransactionType;
import javax.persistence.EntityManagerFactory;
import javax.persistence.spi.PersistenceProvider;
@@ -90,7 +90,7 @@
try {
Map<String, EntityManagerFactory> factories = new HashMap<String, EntityManagerFactory>();
- org.apache.openejb.persistence.dd.Persistence persistence = JaxbPersistenceFactory.getPersistence(url);
+ org.apache.openejb.jee.jpa.unit.Persistence persistence = JaxbPersistenceFactory.getPersistence(url);
List<PersistenceUnit> persistenceUnits = persistence.getPersistenceUnit();
@@ -125,10 +125,10 @@
unitInfo.setMappingFileNames(pu.getMappingFile());
// Handle Properties
- org.apache.openejb.persistence.dd.Properties puiProperties = pu.getProperties();
+ org.apache.openejb.jee.jpa.unit.Properties puiProperties = pu.getProperties();
if (puiProperties != null) {
Properties properties = new Properties();
- for (org.apache.openejb.persistence.dd.Property property : puiProperties.getProperty()) {
+ for (org.apache.openejb.jee.jpa.unit.Property property : puiProperties.getProperty()) {
properties.put(property.getName(), property.getValue());
}
unitInfo.setProperties(properties);
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java?view=diff&rev=499666&r1=499665&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java Wed Jan 24 21:17:13 2007
@@ -32,7 +32,7 @@
import java.io.ByteArrayInputStream;
import java.net.URL;
-import org.apache.openejb.persistence.dd.Persistence;
+import org.apache.openejb.jee.jpa.unit.Persistence;
/**
* @version $Revision$ $Date$
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/JaxbPersistenceFactory.java Wed Jan 24 21:17:13 2007
@@ -15,9 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
-import org.apache.openejb.persistence.PersistenceDeployer;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -37,6 +36,7 @@
* @version $Revision$ $Date$
*/
public class JaxbPersistenceFactory {
+ public static final String PERSISTENCE_SCHEMA = "http://java.sun.com/xml/ns/persistence";
public static Persistence getPersistence(URL url) throws Exception {
InputStream persistenceDescriptor = null;
@@ -80,7 +80,7 @@
@Override
public void startElement(String arg0, String arg1, String arg2, Attributes arg3) throws SAXException {
- super.startElement(PersistenceDeployer.PERSISTENCE_SCHEMA, arg1, arg2, arg3);
+ super.startElement(PERSISTENCE_SCHEMA, arg1, arg2, arg3);
}
}
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/ObjectFactory.java Wed Jan 24 21:17:13 2007
@@ -22,9 +22,8 @@
//
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
-import org.apache.openejb.persistence.dd.Persistence;
import javax.xml.bind.annotation.XmlRegistry;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Persistence.java Wed Jan 24 21:17:13 2007
@@ -22,7 +22,7 @@
//
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
import java.util.ArrayList;
import java.util.List;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/PersistenceUnit.java Wed Jan 24 21:17:13 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Properties.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Properties.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Properties.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Properties.java Wed Jan 24 21:17:13 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Property.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Property.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Property.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/Property.java Wed Jan 24 21:17:13 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessType;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/TransactionType.java Wed Jan 24 21:17:13 2007
@@ -22,7 +22,7 @@
//
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;
import javax.xml.bind.annotation.XmlEnum;
Modified: incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java?view=diff&rev=499666&r1=499663&r2=499666
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/unit/package-info.java Wed Jan 24 21:17:13 2007
@@ -23,4 +23,4 @@
@javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter(value=javax.xml.bind.annotation.adapters.CollapsedStringAdapter.class,type=String.class)
@javax.xml.bind.annotation.XmlSchema(namespace = "http://java.sun.com/xml/ns/persistence", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.openejb.persistence.dd;
+package org.apache.openejb.jee.jpa.unit;