Author: faywang
Date: Sat Oct 3 03:42:01 2009
New Revision: 821236
URL: http://svn.apache.org/viewvc?rev=821236&view=rev
Log:
OPENJPA-1237: allow customized MappingRepository
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java?rev=821236&r1=821235&r2=821236&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
Sat Oct 3 03:42:01 2009
@@ -86,6 +86,10 @@
super(conf);
}
+ public JDBCBrokerFactory(JDBCConfiguration conf, boolean earlyInit) {
+ super(conf, earlyInit);
+ }
+
public Map<String,Object> getProperties() {
// add platform property
Map<String,Object> props = super.getProperties();
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java?rev=821236&r1=821235&r2=821236&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
Sat Oct 3 03:42:01 2009
@@ -150,10 +150,13 @@
return (AbstractBrokerFactory) _pool.get(key);
}
+ protected AbstractBrokerFactory(OpenJPAConfiguration config) {
+ this(config, true);
+ }
/**
* Constructor. Configuration must be provided on construction.
*/
- protected AbstractBrokerFactory(OpenJPAConfiguration config) {
+ protected AbstractBrokerFactory(OpenJPAConfiguration config, boolean
earlyInit) {
_conf = config;
_brokers = newBrokerSet();
getPcClassLoaders();
@@ -164,6 +167,8 @@
_conf.getConnectionRetainModeConstant(), false).close();
}
+ if (!earlyInit)
+ return;
// This eager metadata loading is invoked at construction.
// It can not happen during the MetaDataRepository configuration
because
// within a container environment an uninitialized repository must be
passed