You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2007/09/21 22:56:57 UTC
svn commit: r578271 - in /openjpa/branches/1.0.x:
openjpa-kernel/src/main/java/org/apache/openjpa/conf/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/
openjpa-persis...
Author: mikedd
Date: Fri Sep 21 13:56:55 2007
New Revision: 578271
URL: http://svn.apache.org/viewvc?rev=578271&view=rev
Log:
OPENJPA-380
Added:
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java (with props)
Modified:
openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java?rev=578271&r1=578270&r2=578271&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java (original)
+++ openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java Fri Sep 21 13:56:55 2007
@@ -611,6 +611,14 @@
* @since 0.3.0
*/
public MetaDataRepository getMetaDataRepositoryInstance();
+
+ /**
+ * Returns true if a metaDataRepository has been created for this
+ * configuration.
+ *
+ * @since 1.1.0 1.0.1
+ */
+ public boolean metaDataRepositoryAvailable();
/**
* Create a new empty metadata repository of the configured type.
Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java?rev=578271&r1=578270&r2=578271&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java (original)
+++ openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java Fri Sep 21 13:56:55 2007
@@ -852,6 +852,10 @@
metaRepository = newMetaDataRepositoryInstance();
return metaRepository;
}
+
+ public boolean metaDataRepositoryAvailable(){
+ return metaRepository != null;
+ }
public MetaDataRepository newMetaDataRepositoryInstance() {
return (MetaDataRepository) metaRepositoryPlugin.instantiate(
Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java?rev=578271&r1=578270&r2=578271&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java (original)
+++ openjpa/branches/1.0.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java Fri Sep 21 13:56:55 2007
@@ -388,9 +388,11 @@
broker.close();
}
- // remove metadata repository from listener list
- PCRegistry.removeRegisterClassListener
- (_conf.getMetaDataRepositoryInstance());
+ if(_conf.metaDataRepositoryAvailable()) {
+ // remove metadata repository from listener list
+ PCRegistry.removeRegisterClassListener
+ (_conf.getMetaDataRepositoryInstance());
+ }
_conf.close();
_closed = true;
Added: openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java?rev=578271&view=auto
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java (added)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java Fri Sep 21 13:56:55 2007
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.simple;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+import junit.framework.TestCase;
+
+public class TestEntityManagerFactory extends TestCase {
+
+ /*
+ * This test uses a mis-configured persistence unit to verify that we will
+ * not connect to the database when an unused emf is closed.
+ */
+ public void testCloseUnusedEMF() {
+ EntityManagerFactory emf =
+ Persistence.createEntityManagerFactory("invalid");
+ emf.close();
+ }
+}
Propchange: openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityManagerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=578271&r1=578270&r2=578271&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml (original)
+++ openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml Fri Sep 21 13:56:55 2007
@@ -54,4 +54,13 @@
value="buildSchema(ForeignKeys=true)"/>
</properties>
</persistence-unit>
+
+ <persistence-unit name="invalid">
+ <properties>
+ <property name="openjpa.ConnectionDriverName"
+ value="org.apache.commons.dbcp.BasicDataSource" />
+ <property name="openjpa.ConnectionProperties"
+ value="DriverClassName=not.a.real.Driver,Url=jdbc:notreal://"/>
+ </properties>
+ </persistence-unit>
</persistence>