You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/03/15 14:22:08 UTC
[1/2] syncope git commit: First indexes, then default content,
then views - allowing easy custom SQL init on empty db
Repository: syncope
Updated Branches:
refs/heads/2_0_X b67641176 -> b216aa4ad
refs/heads/master 8032c6e04 -> 3077c6d3b
First indexes, then default content, then views - allowing easy custom SQL init on empty db
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b216aa4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b216aa4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b216aa4a
Branch: refs/heads/2_0_X
Commit: b216aa4adbb14ae0197145d0ef22779466cf89e7
Parents: b676411
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 15 15:20:38 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 15 15:20:38 2018 +0100
----------------------------------------------------------------------
.../core/persistence/jpa/content/XMLContentLoader.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b216aa4a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
index 4059033..bbbe38d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
@@ -75,6 +75,11 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
LOG.info("[{}] Empty database found, loading default content", entry.getKey());
try {
+ createViews(entry.getKey(), entry.getValue());
+ } catch (IOException e) {
+ LOG.error("[{}] While creating indexes", entry.getKey(), e);
+ }
+ try {
ResourceWithFallbackLoader contentXML = ApplicationContextProvider.getBeanFactory().
getBean(entry.getKey() + "ContentXML", ResourceWithFallbackLoader.class);
loadDefaultContent(entry.getKey(), contentXML, entry.getValue());
@@ -83,9 +88,8 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
}
try {
createViews(entry.getKey(), entry.getValue());
- createIndexes(entry.getKey(), entry.getValue());
} catch (IOException e) {
- LOG.error("[{}] While creating indexes and views", entry.getKey(), e);
+ LOG.error("[{}] While creating views", entry.getKey(), e);
}
}
}
[2/2] syncope git commit: First indexes, then default content,
then views - allowing easy custom SQL init on empty db
Posted by il...@apache.org.
First indexes, then default content, then views - allowing easy custom SQL init on empty db
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3077c6d3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3077c6d3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3077c6d3
Branch: refs/heads/master
Commit: 3077c6d3b36cb2634f5cba05d35ee7790e878907
Parents: 8032c6e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 15 15:21:59 2018 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 15 15:21:59 2018 +0100
----------------------------------------------------------------------
.../core/persistence/jpa/content/XMLContentLoader.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3077c6d3/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
index 0211404..c090859 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/content/XMLContentLoader.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.util.Properties;
import javax.annotation.Resource;
import javax.sql.DataSource;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import org.apache.syncope.core.spring.ApplicationContextProvider;
@@ -34,6 +35,7 @@ import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.orm.jpa.EntityManagerFactoryUtils;
import org.springframework.stereotype.Component;
+import org.xml.sax.SAXException;
/**
* Initialize Database with default content if no data is present already.
@@ -74,6 +76,11 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
LOG.info("[{}] Empty database found, loading default content", domain);
try {
+ createIndexes(domain, datasource);
+ } catch (IOException e) {
+ LOG.error("[{}] While creating indexes", domain, e);
+ }
+ try {
ResourceWithFallbackLoader contentXML = ApplicationContextProvider.getBeanFactory().
getBean(domain + "ContentXML", ResourceWithFallbackLoader.class);
loadDefaultContent(domain, contentXML, datasource);
@@ -82,9 +89,8 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
}
try {
createViews(domain, datasource);
- createIndexes(domain, datasource);
} catch (IOException e) {
- LOG.error("[{}] While creating indexes and views", domain, e);
+ LOG.error("[{}] While creating views", domain, e);
}
}
});
@@ -92,7 +98,7 @@ public class XMLContentLoader extends AbstractContentDealer implements ContentLo
private void loadDefaultContent(
final String domain, final ResourceWithFallbackLoader contentXML, final DataSource dataSource)
- throws Exception {
+ throws IOException, ParserConfigurationException, SAXException {
SAXParserFactory factory = SAXParserFactory.newInstance();
try (InputStream in = contentXML.getResource().getInputStream()) {