aboutsummaryrefslogtreecommitdiff
path: root/moaSig/moa-sig-lib
diff options
context:
space:
mode:
Diffstat (limited to 'moaSig/moa-sig-lib')
-rw-r--r--moaSig/moa-sig-lib/build.gradle11
-rw-r--r--moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java3
-rw-r--r--moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java6
-rw-r--r--moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java6
4 files changed, 16 insertions, 10 deletions
diff --git a/moaSig/moa-sig-lib/build.gradle b/moaSig/moa-sig-lib/build.gradle
index a34044c..438b71b 100644
--- a/moaSig/moa-sig-lib/build.gradle
+++ b/moaSig/moa-sig-lib/build.gradle
@@ -14,15 +14,16 @@ dependencies {
compile 'log4j:log4j:1.2.17'
compile 'commons-logging:commons-logging:1.2'
- compile 'commons-io:commons-io:2.6'
- compile 'commons-codec:commons-codec:1.11'
+ compile 'commons-io:commons-io:2.7'
+ compile 'commons-codec:commons-codec:1.14'
compile 'org.apache.axis:axis-jaxrpc:1.4'
- compile 'org.xerial:sqlite-jdbc:3.25.2'
+ compile 'org.xerial:sqlite-jdbc:3.32.3.2'
compile 'javax.xml.bind:jaxb-api:2.3.1'
compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
compile 'com.sun.xml.bind:jaxb-impl:2.3.2'
- compile 'org.postgresql:postgresql:9.4-1204-jdbc42'
- compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.8.1'
+ compile 'org.postgresql:postgresql:42.2.15.jre7'
+ compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
+ compile group: 'org.apache.httpcomponents', name: 'httpclient-cache', version: '4.5.12'
}
task releases(type: Copy) {
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
index 44600db..00ea64d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfigurator.java
@@ -26,6 +26,7 @@ package at.gv.egovernment.moa.spss.server.iaik.config;
import iaik.cms.IaikCCProvider;
import iaik.esi.sva.Configuration;
+import iaik.logging.LogFactory;
import iaik.pki.store.revocation.RevocationFactory;
import iaik.pki.store.revocation.RevocationSourceStore;
import iaik.pki.store.truststore.TrustStoreFactory;
@@ -88,6 +89,8 @@ public class IaikConfigurator {
//SecProviderUtils.dumpSecProviders("Starting configuration");
+ LogFactory.configure(configData.getLoggerConfig());
+
try {
iaik.pki.Configurator.initCommon(configData.getLoggerConfig(),
transId);
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
index d08669e..6ef9c57 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java
@@ -39,6 +39,7 @@ import at.gv.egovernment.moa.spss.MOAException;
import at.gv.egovernment.moa.spss.api.common.TSLConfiguration;
import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
+import at.gv.egovernment.moa.spss.server.iaik.config.LoggerConfigImpl;
import at.gv.egovernment.moa.spss.server.service.RevocationArchiveCleaner;
import at.gv.egovernment.moa.spss.tsl.TSLServiceFactory;
import at.gv.egovernment.moa.spss.tsl.timer.TSLUpdaterTimerTask;
@@ -167,8 +168,9 @@ public class SystemInitializer {
Logger.info("Building IAIK-MOA configuration ... ");
- new IaikConfigurator().configure(config);
-
+ new IaikConfigurator().configure(config);
+
+
runInitializer(config);
Logger.info(new LogMsg(msg.getMessage("init.01", null)));
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
index 74491d8..9989087 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java
@@ -40,11 +40,11 @@ import iaik.logging.LogFactory;
public class IaikLogFactory extends LogFactory {
public Log getInstance(Class clazz) throws LogConfigurationException {
- return getInstanceImpl();
+ return getInstanceImpl(clazz.getName());
}
public Log getInstance(String name) throws LogConfigurationException {
- return getInstanceImpl();
+ return getInstanceImpl(name);
}
/**
@@ -52,7 +52,7 @@ public class IaikLogFactory extends LogFactory {
*
* @return The <code>iaik.logging.Log</code> object to log messages to.
*/
- private Log getInstanceImpl() {
+ private Log getInstanceImpl(String name) {
LoggingContext context = LoggingContextManager.getInstance().getLoggingContext();
if (context != null)
return new IaikLog(context.getNodeID());