Skip to content
Snippets Groups Projects
Commit 943b51d9 authored by Rick Herrick's avatar Rick Herrick
Browse files

XNAT-4273 Started initializing task for database table migration.

parent d6566424
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,7 @@ def vSwagger = '2.4.0'
def vHibernate = '4.3.11.Final'
def vEhcache = '2.6.11'
def vJackson = '2.6.5'
def vPostgreSQL = '9.4.1207'
def vPostgreSQL = '9.4.1209.jre7'
def vServletApi = '3.1.0'
def vTomcat = '7.0.68'
def vCargo = '1.4.18'
......
......@@ -83,10 +83,11 @@ public class EncryptXnatPasswords extends AbstractInitializingTask {
}
return passwords;
}
final ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
}
private static Logger logger = LoggerFactory.getLogger(EncryptXnatPasswords.class);
private static final Logger logger = LoggerFactory.getLogger(EncryptXnatPasswords.class);
private final JdbcTemplate _template;
}
/*
* org.nrg.xnat.initialization.tasks.XnatPasswordEncrypter
* XNAT http://www.xnat.org
* Copyright (c) 2016, Washington University School of Medicine
* All Rights Reserved
*
* Released under the Simplified BSD.
*/
package org.nrg.xnat.initialization.tasks;
import org.nrg.framework.utilities.BasicXnatResourceLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.BadSqlGrammarException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@Component
public class MigrateDatabaseTables extends AbstractInitializingTask {
@Autowired
public MigrateDatabaseTables(final JdbcTemplate template) {
super();
_template = template;
}
@Override
public String getTaskName() {
return "Migrate XNAT database tables";
}
@Override
public void run() {
try {
for (final Resource resource : BasicXnatResourceLocator.getResources("classpath*:META-INF/xnat/migration/**/*-tables.properties")) {
final Properties properties = PropertiesLoaderUtils.loadProperties(resource);
}
} catch (IOException e) {
e.printStackTrace();
}
BasicXnatResourceLocator.getResources()
}
private boolean tableExists(final String name) throws SQLException {
try (final Connection connection = _template.getDataSource().getConnection();
final ResultSet results = connection.getMetaData().getTables("catalog", null, name, new String[]{"TABLE"})) {
if (results.next()) {
return true;
}
}
return false;
}
private static final Logger logger = LoggerFactory.getLogger(MigrateDatabaseTables.class);
private final JdbcTemplate _template;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment