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:29:59 UTC
svn commit: r499668 - in /incubator/openejb/trunk/openejb3/container:
openejb-core/src/main/java/org/apache/openejb/persistence/
openejb-core/src/test/java/org/apache/openejb/persistence/
openejb-core/src/test/resources/ openejb-jee/src/test/java/org/a...
Author: dblevins
Date: Wed Jan 24 21:29:54 2007
New Revision: 499668
URL: http://svn.apache.org/viewvc?view=rev&rev=499668
Log:
Allow xbean-naming to be the JNDI ENC implementation
Added:
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java (contents, props changed)
- copied, changed from r499666, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java
incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/persistence-example.xml (contents, props changed)
- copied, changed from r499663, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/persistence-example.xml
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/EntityManagerFactoryCache.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/
incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/persistence-example.xml
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/persistence/PersistenceDeployer.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=499668&r1=499667&r2=499668
==============================================================================
--- 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:29:54 2007
@@ -24,9 +24,7 @@
import javax.persistence.spi.PersistenceProvider;
import javax.persistence.spi.PersistenceUnitTransactionType;
import javax.sql.DataSource;
-import java.io.IOException;
import java.net.URL;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -158,11 +156,11 @@
unitInfo.setNonJtaDataSource(nonJtaDataSource);
}
- String rootUrlPath = url.toExternalForm().replaceFirst("!?META-INF/persistence.xml$","");
+ String rootUrlPath = url.toExternalForm().replaceFirst("!?META-INF/persistence.xml$", "");
unitInfo.setPersistenceUnitRootUrl(new URL(rootUrlPath));
String persistenceProviderClassName = unitInfo.getPersistenceProviderClassName();
- if (persistenceProviderClassName == null){
+ if (persistenceProviderClassName == null) {
continue;
}
Class clazz = cl.loadClass(persistenceProviderClassName);
@@ -181,33 +179,14 @@
}
- public Map<String, EntityManagerFactory> deploy(ClassLoader cl) throws PersistenceDeployerException {
-
- Map<String, EntityManagerFactory> factoryList = new HashMap<String, EntityManagerFactory>();
- // Read the persistence.xml files
- try {
- Enumeration<URL> urls = cl.getResources("../../../../../../../../openejb-core/src/test/resources/META-INF/persistence.xml");
-
- while (urls.hasMoreElements()) {
- URL url = urls.nextElement();
- factoryList.putAll(loadPersistence(cl, url));
- }
-
- } catch (IOException e) {
- throw new PersistenceDeployerException(e);
- }
-
- return factoryList;
- }
-
- public Map<String, EntityManagerFactory> deploy(List<URL> urls,ClassLoader cl) throws PersistenceDeployerException {
+ public Map<String, EntityManagerFactory> deploy(List<URL> urls, ClassLoader cl) throws PersistenceDeployerException {
Map<String, EntityManagerFactory> factories = new HashMap<String, EntityManagerFactory>();
// Read the persistence.xml files
for (URL url : urls) {
factories.putAll(loadPersistence(cl, url));
- }
+ }
return factories;
}
Copied: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java (from r499666, 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-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java?view=diff&rev=499668&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java&r1=499666&p2=incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java&r2=499668
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/persistence/PersistenceXmlTest.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java Wed Jan 24 21:29:54 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.persistence;
+package org.apache.openejb.jee.jpa;
import junit.framework.TestCase;
Propchange: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/java/org/apache/openejb/jee/jpa/PersistenceXmlTest.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/persistence-example.xml (from r499663, incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/persistence-example.xml)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/persistence-example.xml?view=diff&rev=499668&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/test/resources/persistence-example.xml&r1=499663&p2=incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/persistence-example.xml&r2=499668
==============================================================================
(empty)
Propchange: incubator/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/persistence-example.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL