aboutsummaryrefslogtreecommitdiff
path: root/moaSig
diff options
context:
space:
mode:
Diffstat (limited to 'moaSig')
-rw-r--r--moaSig/common/build.gradle6
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java7
-rw-r--r--moaSig/libs/iaik_cpades-2.4_MOA.jar (renamed from moaSig/libs/iaik_cpades-2.5.1_moa.jar)bin129818 -> 130134 bytes
-rw-r--r--moaSig/libs/iaik_eccelerate-5.01.jarbin596757 -> 0 bytes
-rw-r--r--moaSig/libs/iaik_eccelerate-6.02.jarbin0 -> 647834 bytes
-rw-r--r--moaSig/libs/iaik_eccelerate_addon-6.02.jar (renamed from moaSig/libs/iaik_eccelerate_addon-5.01.jar)bin90630 -> 88796 bytes
-rw-r--r--moaSig/libs/iaik_eccelerate_cms-6.02.jar (renamed from moaSig/libs/iaik_eccelerate_cms-5.01.jar)bin4769 -> 4769 bytes
-rw-r--r--moaSig/libs/iaik_jce_full_signed-5.61_MOA.jar (renamed from moaSig/libs/iaik_jce_full-5.52_moa.jar)bin1301058 -> 1318695 bytes
-rw-r--r--moaSig/libs/iaik_jsse-4.4.jarbin34853 -> 0 bytes
-rw-r--r--moaSig/libs/iaik_xsect-2.14_MOA.jar (renamed from moaSig/libs/iaik_xsect-2.13_moa.jar)bin440160 -> 445795 bytes
-rw-r--r--moaSig/libs/tsl-lib-2.0.3.jarbin0 -> 978757 bytes
-rw-r--r--moaSig/moa-asic/build.gradle2
-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
-rw-r--r--moaSig/moa-sig/build.gradle2
17 files changed, 25 insertions, 18 deletions
diff --git a/moaSig/common/build.gradle b/moaSig/common/build.gradle
index 8bd4bb3..88ff053 100644
--- a/moaSig/common/build.gradle
+++ b/moaSig/common/build.gradle
@@ -1,11 +1,11 @@
dependencies {
compile files('../libs/iaik_jce_full-5.52_moa.jar')
- compile 'org.slf4j:slf4j-api:1.7.12'
+ compile 'org.slf4j:slf4j-api:1.7.30'
compile 'xerces:xercesImpl:2.12.0'
compile 'xalan:xalan:2.7.1'
- compile 'joda-time:joda-time:2.10.1'
- compile 'jaxen:jaxen:1.1.6'
+ compile 'joda-time:joda-time:2.10.6'
+ compile 'jaxen:jaxen:1.2.0'
}
task testJar(type: Jar, dependsOn: testClasses) {
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
index da3c4c8..7c29ea1 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java
@@ -442,8 +442,8 @@ public interface Constants {
+ (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " ")
+ (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " ")
+ (ASIC_URI + " " + ASIC_SCHEMA_LOCATION + " ")
- + (SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION + " ");
- //+ (eDELIVERY20 + " " + eDELIVERY20_SCHEMA_LOCATION);
+ + (SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION + " ")
+ + (eDELIVERY20 + " " + eDELIVERY20_SCHEMA_LOCATION);
/**
* Contains all namespaces and local schema locations for XML schema
@@ -480,7 +480,8 @@ public interface Constants {
+ (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " ")
+ (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " ")
+ (ASIC_URI + " " + ASIC_SCHEMA_LOCATION + " ")
- + (SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION);
+ + (SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION + " ")
+ + (eDELIVERY20 + " " + eDELIVERY20_SCHEMA_LOCATION);
/** URN prefix for bPK and wbPK. */
public static final String URN_PREFIX = "urn:publicid:gv.at";
diff --git a/moaSig/libs/iaik_cpades-2.5.1_moa.jar b/moaSig/libs/iaik_cpades-2.4_MOA.jar
index f225f27..300c215 100644
--- a/moaSig/libs/iaik_cpades-2.5.1_moa.jar
+++ b/moaSig/libs/iaik_cpades-2.4_MOA.jar
Binary files differ
diff --git a/moaSig/libs/iaik_eccelerate-5.01.jar b/moaSig/libs/iaik_eccelerate-5.01.jar
deleted file mode 100644
index 0d83fc5..0000000
--- a/moaSig/libs/iaik_eccelerate-5.01.jar
+++ /dev/null
Binary files differ
diff --git a/moaSig/libs/iaik_eccelerate-6.02.jar b/moaSig/libs/iaik_eccelerate-6.02.jar
new file mode 100644
index 0000000..e30b629
--- /dev/null
+++ b/moaSig/libs/iaik_eccelerate-6.02.jar
Binary files differ
diff --git a/moaSig/libs/iaik_eccelerate_addon-5.01.jar b/moaSig/libs/iaik_eccelerate_addon-6.02.jar
index 957fa5a..94f2de5 100644
--- a/moaSig/libs/iaik_eccelerate_addon-5.01.jar
+++ b/moaSig/libs/iaik_eccelerate_addon-6.02.jar
Binary files differ
diff --git a/moaSig/libs/iaik_eccelerate_cms-5.01.jar b/moaSig/libs/iaik_eccelerate_cms-6.02.jar
index ed4e816..32d7aec 100644
--- a/moaSig/libs/iaik_eccelerate_cms-5.01.jar
+++ b/moaSig/libs/iaik_eccelerate_cms-6.02.jar
Binary files differ
diff --git a/moaSig/libs/iaik_jce_full-5.52_moa.jar b/moaSig/libs/iaik_jce_full_signed-5.61_MOA.jar
index 4ce6c24..78b79e9 100644
--- a/moaSig/libs/iaik_jce_full-5.52_moa.jar
+++ b/moaSig/libs/iaik_jce_full_signed-5.61_MOA.jar
Binary files differ
diff --git a/moaSig/libs/iaik_jsse-4.4.jar b/moaSig/libs/iaik_jsse-4.4.jar
deleted file mode 100644
index 15b3204..0000000
--- a/moaSig/libs/iaik_jsse-4.4.jar
+++ /dev/null
Binary files differ
diff --git a/moaSig/libs/iaik_xsect-2.13_moa.jar b/moaSig/libs/iaik_xsect-2.14_MOA.jar
index 95f18ef..aa3c229 100644
--- a/moaSig/libs/iaik_xsect-2.13_moa.jar
+++ b/moaSig/libs/iaik_xsect-2.14_MOA.jar
Binary files differ
diff --git a/moaSig/libs/tsl-lib-2.0.3.jar b/moaSig/libs/tsl-lib-2.0.3.jar
new file mode 100644
index 0000000..e1321ac
--- /dev/null
+++ b/moaSig/libs/tsl-lib-2.0.3.jar
Binary files differ
diff --git a/moaSig/moa-asic/build.gradle b/moaSig/moa-asic/build.gradle
index a030672..f8a536d 100644
--- a/moaSig/moa-asic/build.gradle
+++ b/moaSig/moa-asic/build.gradle
@@ -16,7 +16,7 @@ dependencies {
compile project(':common')
compile project(':moa-sig-lib')
- compile 'org.slf4j:slf4j-log4j12:1.7.12'
+ compile 'org.slf4j:slf4j-log4j12:1.7.30'
}
sourceSets {
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());
diff --git a/moaSig/moa-sig/build.gradle b/moaSig/moa-sig/build.gradle
index f6268c6..1ce801c 100644
--- a/moaSig/moa-sig/build.gradle
+++ b/moaSig/moa-sig/build.gradle
@@ -16,7 +16,7 @@ dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
providedCompile 'javax.servlet:servlet-api:2.4'
compile 'commons-discovery:commons-discovery:0.5'
- compile 'org.slf4j:slf4j-log4j12:1.7.25'
+ compile 'org.slf4j:slf4j-log4j12:1.7.30'
//compile 'org.apache.cxf:cxf-rt-frontend-jaxws:3.1.4'
//compile 'org.apache.cxf:cxf-rt-transports-http:3.1.4'
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 03:51:20 +0000