From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 12:03:02 +0100 Subject: Fix build. - Remove svn metadata. - Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom). - Switch jdk 1.5/1.6 to 1.7. - Exclude non working tests. --- spss/server/serverlib/pom.xml | 5 ++--- spss/server/tools/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'spss/server') diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index da78d3dc1..e16d46d43 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -301,11 +301,10 @@ - http://java.sun.com/j2se/1.4/docs/api/ - http://java.sun.com/j2se/1.5.0/docs/api/ + http://docs.oracle.com/javase/7/docs/api/ http://logging.apache.org/log4j/docs/api/ - 1.5 + 1.7 diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index f139e962d..277ef8459 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -76,8 +76,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.7 + 1.7 -- cgit v1.2.3 From ba5b11188fc2bb3dfd322d8bd1d6e35038d27bec Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Tue, 25 Nov 2014 13:47:22 +0100 Subject: Remove eclipse project settings from scm. --- id/server/legacy-backup/mw-messages-api/.classpath | 27 -------------- id/server/legacy-backup/mw-messages-api/.project | 36 ------------------- .../.settings/org.eclipse.core.resources.prefs | 5 --- .../.settings/org.eclipse.jdt.core.prefs | 8 ----- .../.settings/org.eclipse.m2e.core.prefs | 4 --- .../.settings/org.eclipse.wst.common.component | 6 ---- .../org.eclipse.wst.common.project.facet.core.xml | 5 --- .../.settings/org.eclipse.wst.validation.prefs | 2 -- spss/server/serverws/.project | 42 ---------------------- 9 files changed, 135 deletions(-) delete mode 100644 id/server/legacy-backup/mw-messages-api/.classpath delete mode 100644 id/server/legacy-backup/mw-messages-api/.project delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs delete mode 100644 spss/server/serverws/.project (limited to 'spss/server') diff --git a/id/server/legacy-backup/mw-messages-api/.classpath b/id/server/legacy-backup/mw-messages-api/.classpath deleted file mode 100644 index c15838fd0..000000000 --- a/id/server/legacy-backup/mw-messages-api/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.project b/id/server/legacy-backup/mw-messages-api/.project deleted file mode 100644 index cc4d05bc1..000000000 --- a/id/server/legacy-backup/mw-messages-api/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - mw-messages-api - - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647ee..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 76393eede..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 \ No newline at end of file diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component deleted file mode 100644 index ec983b870..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index a1f6907b8..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs b/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 04cad8cb7..000000000 --- a/id/server/legacy-backup/mw-messages-api/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,2 +0,0 @@ -disabled=06target -eclipse.preferences.version=1 diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project deleted file mode 100644 index 8150d984e..000000000 --- a/spss/server/serverws/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - moa-spss-ws - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.jsdt.core.jsNature - - -- cgit v1.2.3 From a38072d6c778d27a1ed3cf265ff7d3a6b7e38825 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Fri, 23 Jan 2015 13:08:22 +0100 Subject: exclude iaik_jce_eval_signed --- spss/server/serverws/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'spss/server') diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index bbfb3c443..b90026252 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -109,6 +109,10 @@ iaik_pki_module iaik + + iaik_jce_eval_signed + iaik + -- cgit v1.2.3 From 443787eddd778e5388cba643413531981edc50ed Mon Sep 17 00:00:00 2001 From: Florian Reimair Date: Mon, 23 Mar 2015 13:42:33 +0100 Subject: error message when a keygroup is not found --- .../moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'spss/server') diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java index d1281c1f1..6a85415f8 100644 --- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java +++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationProfileFactory.java @@ -145,7 +145,12 @@ public class XMLSignatureCreationProfileFactory { // get the key group id String keyGroupID = request.getKeyIdentifier(); // get digest method on key group level (if configured) - String configDigestMethodKG = config.getKeyGroup(keyGroupID).getDigestMethodAlgorithm(); + KeyGroup keygroup = config.getKeyGroup(keyGroupID); + if(null == keygroup) { + Logger.error("Could not find key group '" + keyGroupID + "'"); + throw new MOAApplicationException("2231", null); + } + String configDigestMethodKG = keygroup.getDigestMethodAlgorithm(); // get default digest method (if configured) String configDigestMethod = config.getDigestMethodAlgorithmName(); -- cgit v1.2.3 From 3060411f3e02094e5d3dbd44f1037cfd3ce4c5aa Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Mon, 11 May 2015 16:47:25 +0200 Subject: adjustments for idea deployment --- id/server/idserverlib/pom.xml | 24 ++++++++++++++++++++++++ id/server/moa-id-commons/pom.xml | 10 +++++++++- spss/server/serverlib/pom.xml | 10 +++++++++- 3 files changed, 42 insertions(+), 2 deletions(-) (limited to 'spss/server') diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 9465b56d1..19e81c36d 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -49,6 +49,23 @@ MOA.id.server moa-id-commons + + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.hibernate + hibernate-c3p0 + ${hibernate.version} + + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + org.springframework diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 27beeaaf3..05fd67568 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -76,8 +76,16 @@ moa-common jar + - + + iaik.prod iaik_X509TrustManager diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index e16d46d43..504b0dc84 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -129,7 +129,15 @@ moa-common jar - + + + MOA moa-common -- cgit v1.2.3