Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OPENJPA-2640] Applying provided patch 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1743607 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Francesco Chicchiriccò 2016-05-13 06:49:59 +00:00
parent 5899205deb
commit 0ac7140b82
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCBrokerFactory.java
View File

@ -144,7 +144,7 @@ public class JDBCBrokerFactory
String props = Configurations.getProperties(action);
action = Configurations.getClassName(action);
MappingTool tool = new MappingTool(conf, action, false);
MappingTool tool = new MappingTool(conf, action, false, loader);
Configurations.configureInstance(tool, conf, props,
"SynchronizeMappings");

20
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
View File

@ -109,6 +109,7 @@ public class MappingTool
private final String _action;
private final boolean _meta;
private final int _mode;
private final ClassLoader _loader;
private final DBDictionary _dict;
private MappingRepository _repos = null;
@ -136,6 +137,13 @@ public class MappingTool
* Constructor. Supply configuration and action.
*/
public MappingTool(JDBCConfiguration conf, String action, boolean meta) {
this(conf, action, meta, null);
}
/**
* Constructor. Supply configuration and action.
*/
public MappingTool(JDBCConfiguration conf, String action, boolean meta, ClassLoader loader) {
_conf = conf;
_log = conf.getLog(JDBCConfiguration.LOG_METADATA);
_meta = meta;
@ -154,6 +162,8 @@ public class MappingTool
else
_mode = MODE_MAPPING;
_loader = loader;
_dict = _conf.getDBDictionaryInstance();
}
@ -627,7 +637,7 @@ public class MappingTool
for (int i = 0; i < fmds.length; i++) {
smd = fmds[i].getValueSequenceMetaData();
if (smd != null) {
seq = smd.getInstance(null);
seq = smd.getInstance(_loader);
if (seq instanceof JDBCSeq)
((JDBCSeq) seq).addSchema(mapping, group);
} else if (fmds[i].getEmbeddedMapping() != null)
@ -936,7 +946,7 @@ public class MappingTool
public boolean run(Options opts) throws IOException, SQLException {
JDBCConfiguration conf = new JDBCConfigurationImpl();
try {
return MappingTool.run(conf, args, opts);
return MappingTool.run(conf, args, opts, null);
} finally {
conf.close();
}
@ -955,7 +965,7 @@ public class MappingTool
* @see #main
*/
public static boolean run(JDBCConfiguration conf, String[] args,
Options opts)
Options opts, ClassLoader loader)
throws IOException, SQLException {
// flags
Flags flags = new Flags();
@ -991,8 +1001,6 @@ public class MappingTool
opts.setProperty("schemas", schemas);
Configurations.populateConfiguration(conf, opts);
ClassLoader loader = conf.getClassResolverInstance().
getClassLoader(MappingTool.class, null);
if (flags.meta && ACTION_ADD.equals(flags.action))
flags.metaDataFile = Files.getFile(fileName, loader);
else
@ -1066,7 +1074,7 @@ public class MappingTool
MappingTool tool;
try {
tool = new MappingTool(conf, flags.action, flags.meta);
tool = new MappingTool(conf, flags.action, flags.meta, loader);
} catch (IllegalArgumentException iae) {
return false;
}

2
openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/AbstractOpenJpaMappingToolMojo.java
View File

@ -104,7 +104,7 @@ public abstract class AbstractOpenJpaMappingToolMojo extends AbstractOpenJpaMojo
public boolean run(Options opts) throws IOException, SQLException {
JDBCConfiguration conf = new JDBCConfigurationImpl();
try {
return MappingTool.run(conf, args, opts);
return MappingTool.run(conf, args, opts, Thread.currentThread().getContextClassLoader());
} finally {
conf.close();
}