From 29f4a42701b3f2952adc1bdbc463f280b23d3d26 Mon Sep 17 00:00:00 2001 From: kstranacher_eGovL Date: Mon, 10 Dec 2012 14:40:00 +0000 Subject: git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1300 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common/pom.xml | 4 +++ id/server/auth/src/main/webapp/iframeHandyBKU.html | 7 ++-- .../auth/src/main/webapp/iframeOnlineBKU.html | 6 ++-- id/server/auth/src/main/webapp/index.html | 14 ++++---- .../auth/src/main/webapp/template_handyBKU.html | 1 - .../auth/src/main/webapp/template_localBKU.html | 3 +- .../auth/src/main/webapp/template_onlineBKU.html | 3 +- .../moa/spss/server/init/SystemInitializer.java | 24 +++++--------- spss/server/serverws/.classpath | 38 ++++++++++++++++------ .../org.eclipse.wst.common.project.facet.core.xml | 4 +-- spss/server/tools/.classpath | 21 ++++++------ 11 files changed, 70 insertions(+), 55 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 560e6fe5a..054eb4843 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -24,6 +24,10 @@ iaik.prod iaik_jce_full + + iaik.prod + iaik_moa + junit junit diff --git a/id/server/auth/src/main/webapp/iframeHandyBKU.html b/id/server/auth/src/main/webapp/iframeHandyBKU.html index 0f6e1e282..b5936679f 100644 --- a/id/server/auth/src/main/webapp/iframeHandyBKU.html +++ b/id/server/auth/src/main/webapp/iframeHandyBKU.html @@ -8,11 +8,11 @@ -
- Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: + diff --git a/id/server/auth/src/main/webapp/template_onlineBKU.html b/id/server/auth/src/main/webapp/template_onlineBKU.html index 565955538..b8cd19866 100644 --- a/id/server/auth/src/main/webapp/template_onlineBKU.html +++ b/id/server/auth/src/main/webapp/template_onlineBKU.html @@ -11,8 +11,7 @@ - - Falls Sie nicht automatisch weitergeleitet werden klicken Sie bitte hier: + diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java index 71cf4f25b..b4b172c8a 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/init/SystemInitializer.java @@ -118,11 +118,11 @@ public class SystemInitializer { Map mapTrustProfiles = config.getTrustProfiles(); -// Iterator it = mapTrustProfiles.entrySet().iterator(); -// while (it.hasNext()) { -// Map.Entry pairs = (Map.Entry)it.next(); -// System.out.println(pairs.getKey() + " = " + pairs.getValue()); -// } + Iterator it = mapTrustProfiles.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry pairs = (Map.Entry)it.next(); + System.out.println(pairs.getKey() + " = " + pairs.getValue()); + } //@TSL get parameters for StoreUpdater CertStoreParameters[] certStoreParameters = configData.getPKIConfiguration().getCertStoreConfiguration().getParameters(); @@ -130,19 +130,13 @@ public class SystemInitializer { TransactionId tid = null; - - - //@TSL Init TSL Module -// X509Certificate[] removeCertificates = null; -// X509Certificate[] addCertificates = null; -// -// // + X509Certificate[] removeCertificates = null; + X509Certificate[] addCertificates = null; + // iaik.pki.store.utils.StoreUpdater storeUpdater = new StoreUpdater(certStoreParameters, trustStoreProfiles, tid); // storeUpdater.removeCertificatesFromTrustStores(removeCertificates, tid); -// -// storeUpdater.addCertificatesToTrustStores(addCertificates, tid); -// + Logger.info(new LogMsg(msg.getMessage("init.01", null))); } catch (MOAException e) { diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath index af4743f8a..b8d52d398 100644 --- a/spss/server/serverws/.classpath +++ b/spss/server/serverws/.classpath @@ -1,12 +1,30 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml index df66dd21b..a801c94a0 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ + - - + \ No newline at end of file diff --git a/spss/server/tools/.classpath b/spss/server/tools/.classpath index a9bfad977..8f14aea5e 100644 --- a/spss/server/tools/.classpath +++ b/spss/server/tools/.classpath @@ -1,12 +1,13 @@ - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + -- cgit v1.2.3