Fixing issues uncovered while running -Dsetup option with non-existent plugin based database scripts

revert-dabc3590
prabathabey 9 years ago
parent 530c6049ba
commit 58ae783a49

@ -45,21 +45,18 @@ public final class MobileDeviceManagementSchemaInitializer extends DatabaseCreat
return pluginType; return pluginType;
} }
public void setPluginType(String pluginType) {
this.pluginType = pluginType;
}
public MobileDeviceManagementSchemaInitializer(DataSource dataSource, String pType) { public MobileDeviceManagementSchemaInitializer(DataSource dataSource, String pType) {
super(dataSource); super(dataSource);
this.pluginType = pType; this.pluginType = pType;
} }
protected String getDbScriptLocation(String databaseType) { protected String getDbScriptLocation(String databaseType) {
String scriptName = databaseType + "_" + getPluginType() + ".sql"; String scriptName = databaseType + ".sql";
String scriptLocation = setupSQLScriptBaseLocation + this.getPluginType() + File.separator + scriptName;
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Loading database script from :" + scriptName); log.debug("Loading database script from :" + scriptLocation);
} }
return setupSQLScriptBaseLocation.replaceFirst("DBTYPE", databaseType) + scriptName; return scriptLocation;
} }
} }

Loading…
Cancel
Save