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') 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') 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 0ed0a7702850b2001aaa8d5b194708a96e90dea3 Mon Sep 17 00:00:00 2001 From: Thomas Knall Date: Fri, 9 Jan 2015 11:25:10 +0100 Subject: Apply several fixes. - Disable erroneous IAIK PKI logger initialization (should be addressed by. - Remove redundant maven-dependency version declarations. - Fix maven/eclipse lifecyle warning problem. --- common/pom.xml | 1 - .../moa/id/auth/MOAIDAuthInitializer.java | 3 +++ id/server/moa-id-commons/pom.xml | 31 ++++++++++++++++++++++ id/server/stork2-commons/pom.xml | 1 - id/server/stork2-saml-engine/pom.xml | 1 - spss/handbook/clients/api/pom.xml | 1 - spss/handbook/clients/pom.xml | 1 - spss/handbook/clients/referencedData/pom.xml | 1 - spss/handbook/clients/webservice/pom.xml | 2 -- 9 files changed, 34 insertions(+), 8 deletions(-) (limited to 'spss') diff --git a/common/pom.xml b/common/pom.xml index 3d790d29b..bde3339d6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -97,7 +97,6 @@ log4j log4j - 1.2.17 org.slf4j diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java index db36356c0..c3575470f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java @@ -148,12 +148,15 @@ public class MOAIDAuthInitializer { } } + // FIXME[@tlenz]: iaik.prod:iaik_X509TrustManager requires iaik.IAIKRuntimeException (should have been moved from iaik.server.modules (iaik.prod:iaik_moa:1.51)) // Initializes IAIKX509TrustManager logging + /* String log4jConfigURL = System.getProperty("log4j.configuration"); Logger.info("Log4J Configuration: " + log4jConfigURL); if (log4jConfigURL != null) { IAIKX509TrustManager.initLog(new LoggerConfigImpl(log4jConfigURL)); } + */ // Initializes the Axis secure socket factory for use in calling the // MOA-SP web service diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 834a19d03..8f2fbd628 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -139,6 +139,37 @@ + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jvnet.hyperjaxb3 + maven-hyperjaxb3-plugin + 0.5.6 + + generate + + + + + + + + + + + + + diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml index 44ab8ddaf..369e3fa6d 100644 --- a/id/server/stork2-commons/pom.xml +++ b/id/server/stork2-commons/pom.xml @@ -41,7 +41,6 @@ log4j log4j - 1.2.17 javax.jms diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 777c7393f..63a84998c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -124,7 +124,6 @@ xerces xercesImpl - 2.11.0 test diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml index 581c29e56..0690b65e3 100644 --- a/spss/handbook/clients/api/pom.xml +++ b/spss/handbook/clients/api/pom.xml @@ -9,7 +9,6 @@ MOA.spss.handbook moa-spss-handbook-apiClient jar - 2.0 MOA SP/SS Handbook API Client diff --git a/spss/handbook/clients/pom.xml b/spss/handbook/clients/pom.xml index c104c6c3b..1dfa3d532 100644 --- a/spss/handbook/clients/pom.xml +++ b/spss/handbook/clients/pom.xml @@ -10,7 +10,6 @@ MOA.spss.handbook.clients moa-spss-handbook-clients pom - 2.0 MOA SP/SS Handbook Clients diff --git a/spss/handbook/clients/referencedData/pom.xml b/spss/handbook/clients/referencedData/pom.xml index 3a220fd4d..e9370cd44 100644 --- a/spss/handbook/clients/referencedData/pom.xml +++ b/spss/handbook/clients/referencedData/pom.xml @@ -10,7 +10,6 @@ MOA.spss.handbook moa-spss-handbook-referencedData war - 2.0 MOA SP/SS Handbook Referenced Data diff --git a/spss/handbook/clients/webservice/pom.xml b/spss/handbook/clients/webservice/pom.xml index 50850b592..9a98ce472 100644 --- a/spss/handbook/clients/webservice/pom.xml +++ b/spss/handbook/clients/webservice/pom.xml @@ -6,10 +6,8 @@ 4.0.0 - MOA.spss.handbook.clients moa-spss-handbook-webserviceClient jar - 2.0 MOA SP/SS Handbook WebService Client -- cgit v1.2.3