From 9b787d3409e629f292a98d0b5a0aad036b7421c7 Mon Sep 17 00:00:00 2001 From: mcentner Date: Fri, 17 Aug 2007 08:47:35 +0000 Subject: Improved and updated maven build process. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@919 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-proxy.xml | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 id/assembly-proxy.xml (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml new file mode 100644 index 000000000..52c9a4f30 --- /dev/null +++ b/id/assembly-proxy.xml @@ -0,0 +1,93 @@ + + ID-proxy + + + zip + + + + false + + + + ${basedir}/id/server/data/deploy + /proxy + + **/conf/moa-spss/** + **/conf/moa-id/transforms/** + + + + ${basedir}/id/server/doc + /proxy/doc + + + ${basedir}/licenses + /proxy + + APACHE-LICENSE-2.0.txt + history.txt + IAIK-LICENSE.txt + readme_1.4.0.txt + + + + + + + + MOA.id.server:moa-id-proxy + + + true + /proxy + ${artifactId}.${extension} + + + + xalan:xalan + xerces:xercesImpl + xerces:xmlParserAPIs + + /proxy/endorsed + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper + + /proxy/ext + + + false + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /proxy/moa-id/doc + true + + + + + MOA.id:moa-id-templates + + + false + moaid-templates.war + /proxy/templates + false + + + + + + \ No newline at end of file -- cgit v1.2.3 From 0764b6e3e5bc152a70d269bee283a52b7584f075 Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 22 Aug 2007 14:28:38 +0000 Subject: Updated xalan und xerces libraries and as consequence, added regexp to id/server/idserverlib. Changed paths in distribution zip-files. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@928 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 22 +++++++++++----------- id/assembly-proxy.xml | 18 +++++++++--------- id/server/idserverlib/pom.xml | 4 ++++ pom.xml | 6 +++--- spss/assembly.xml | 2 +- 5 files changed, 28 insertions(+), 24 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index e0a1db0c7..0dd875720 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -6,37 +6,37 @@ - false + moa-id-auth-${project.version} ${basedir}/id/server/data/deploy - /auth + / **/conf/moa-id/oa/** ${basedir}/spss/handbook/conf/moa-spss/certstore - /auth/conf/moa-id/certs/certstore + /conf/moa-id/certs/certstore **/* ${basedir}/spss/handbook/conf/moa-spss/certstore - /auth/conf/moa-spss/certstore + /conf/moa-spss/certstore **/* ${basedir}/id/server/doc - /auth/doc + /doc ${basedir}/licenses - /auth + / APACHE-LICENSE-2.0.txt history.txt @@ -53,7 +53,7 @@ true - /auth + / ${artifactId}.${extension} @@ -62,7 +62,7 @@ xerces:xercesImpl xerces:xmlParserAPIs - /auth/endorsed + /endorsed @@ -71,7 +71,7 @@ iaik.prod:iaik_Pkcs11Provider iaik.prod:iaik_Pkcs11Wrapper - /auth/ext + /ext false @@ -85,7 +85,7 @@ javadoc false api-doc - /auth/moa-id/doc + /moa-id/doc true @@ -96,7 +96,7 @@ false moaid-templates.war - /auth/templates + /templates false diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 52c9a4f30..03cdd837c 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -6,12 +6,12 @@ - false + moa-id-proxy-${project.version} ${basedir}/id/server/data/deploy - /proxy + / **/conf/moa-spss/** **/conf/moa-id/transforms/** @@ -19,11 +19,11 @@ ${basedir}/id/server/doc - /proxy/doc + /doc ${basedir}/licenses - /proxy + / APACHE-LICENSE-2.0.txt history.txt @@ -40,7 +40,7 @@ true - /proxy + / ${artifactId}.${extension} @@ -49,7 +49,7 @@ xerces:xercesImpl xerces:xmlParserAPIs - /proxy/endorsed + /endorsed @@ -58,7 +58,7 @@ iaik.prod:iaik_Pkcs11Provider iaik.prod:iaik_Pkcs11Wrapper - /proxy/ext + /ext false @@ -72,7 +72,7 @@ javadoc false api-doc - /proxy/moa-id/doc + /moa-id/doc true @@ -83,7 +83,7 @@ false moaid-templates.war - /proxy/templates + /templates false diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index daa9bfd6d..357ec0750 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -107,6 +107,10 @@ iaik.prod iaik_X509TrustManager + + regexp + regexp + diff --git a/pom.xml b/pom.xml index c85c7b307..b35bdc0ae 100644 --- a/pom.xml +++ b/pom.xml @@ -257,19 +257,19 @@ xalan xalan - 2.5.1 + 2.7.0 compile xerces xercesImpl - 2.4.0 + 2.7.1 compile xerces xmlParserAPIs - 2.6.0 + 2.6.2 compile diff --git a/spss/assembly.xml b/spss/assembly.xml index 998a0d0e4..aa5666b6f 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -5,7 +5,7 @@ zip - false + moa-spss-${project.version} -- cgit v1.2.3 From 7537351b14d0738d9e16bef4fad8380c3a0b0f21 Mon Sep 17 00:00:00 2001 From: pdanner Date: Wed, 22 Aug 2007 18:54:53 +0000 Subject: minor build fixes/improvements git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@934 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common-test/pom.xml | 4 + common/pom.xml | 4 + id/assembly-auth.xml | 168 +++++++++++++------------ id/assembly-proxy.xml | 124 +++++++++---------- id/server/auth/pom.xml | 4 +- id/server/idserverlib/pom.xml | 10 +- id/server/proxy/pom.xml | 140 ++++++++++----------- pom.xml | 280 +++++++++++++++++++++--------------------- spss/server/serverlib/pom.xml | 18 ++- 9 files changed, 393 insertions(+), 359 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/common-test/pom.xml b/common-test/pom.xml index fc017a907..f50be285f 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -35,18 +35,22 @@ iaik.prod iaik_jce_full + true xalan xalan + true xerces xercesImpl + true xerces xmlParserAPIs + true diff --git a/common/pom.xml b/common/pom.xml index 91907344f..5e860e659 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,6 +25,7 @@ iaik.prod iaik_jce_full + true junit @@ -42,14 +43,17 @@ xalan xalan + true xerces xercesImpl + true xerces xmlParserAPIs + true diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 0dd875720..986c4c44a 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -2,34 +2,35 @@ ID-auth - zip + zip - moa-id-auth-${project.version} + moa-id-auth-${project.version} ${basedir}/id/server/data/deploy - / - - **/conf/moa-id/oa/** - + / + + **/conf/moa-id/oa/** + **/conf/Catalina/** + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-id/certs/certstore + + **/* + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-spss/certstore + + **/* + - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-id/certs/certstore - - **/* - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-spss/certstore - - **/* - - ${basedir}/id/server/doc /doc @@ -44,62 +45,71 @@ readme_1.4.0.txt - - - - - - MOA.id.server:moa-id-auth - - - true - / - ${artifactId}.${extension} - - - - xalan:xalan - xerces:xercesImpl - xerces:xmlParserAPIs - - /endorsed - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper - - /ext - - - false - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /moa-id/doc - true - - - - - MOA.id:moa-id-templates - - - false - moaid-templates.war - /templates - false - - - - - \ No newline at end of file + + /ext + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper + + + + + + + + MOA.id.server:moa-id-auth + + + false + / + ${artifactId}.${extension} + + + + xalan:xalan + xerces:xercesImpl + xerces:xmlParserAPIs + + /endorsed + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper + + /ext + + + false + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc + true + + + + + MOA.id:moa-id-templates + + + false + moaid-templates.war + /templates + false + + + + + diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 03cdd837c..cd84be4bc 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -2,18 +2,18 @@ ID-proxy - zip + zip - moa-id-proxy-${project.version} + moa-id-proxy-${project.version} - + ${basedir}/id/server/data/deploy / - **/conf/moa-spss/** + **/conf/moa-spss/** **/conf/moa-id/transforms/** @@ -33,61 +33,61 @@ - - - - MOA.id.server:moa-id-proxy - - - true - / - ${artifactId}.${extension} - - - - xalan:xalan - xerces:xercesImpl - xerces:xmlParserAPIs - - /endorsed - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper - - /ext - - - false - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /moa-id/doc - true - - - - - MOA.id:moa-id-templates - - - false - moaid-templates.war - /templates - false - - - - - - \ No newline at end of file + + + + MOA.id.server:moa-id-proxy + + + true + / + ${artifactId}.${extension} + + + + xalan:xalan + xerces:xercesImpl + xerces:xmlParserAPIs + + /endorsed + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper + + /ext + + + false + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc + true + + + + + MOA.id:moa-id-templates + + + false + moaid-templates.war + /templates + false + + + + + + diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 405f6f390..8dd93220b 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -31,6 +31,7 @@ true + @@ -59,4 +61,4 @@ - \ No newline at end of file + diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 357ec0750..6add66ebe 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -25,7 +25,6 @@ axis axis - 1.4 javax.mail @@ -39,14 +38,17 @@ xerces xercesImpl + true xerces xmlParserAPIs + true xalan xalan + true junit @@ -93,11 +95,13 @@ iaik.prod iaik_ecc + true iaik.prod iaik_jce_full provided + true iaik.prod @@ -108,8 +112,8 @@ iaik_X509TrustManager - regexp - regexp + regexp + regexp diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index eb912c659..db0897931 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -1,5 +1,5 @@ - MOA.id @@ -7,67 +7,69 @@ 1.4.0 - - ${basedir}/../../../repository - - - + + ${basedir}/../../../repository + + + 4.0.0 MOA.id.server moa-id-proxy war 1.4.0 MOA ID-Proxy WebService - - - - - org.apache.maven.plugins - maven-war-plugin - 2.0.2 - - - - false - true - - - - - ${basedir}/../resources - WEB-INF/classes/resources - - - ${basedir}/../services - WEB-INF/classes/META-INF/services - - - - - - test - package - - exploded - - - - - - - + + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.2 + + + + false + true + + + + + + + test + package + + exploded + + + + + + + - - MOA.spss.server - moa-spss-lib - ${project.version} - - - MOA.id.server - moa-id-lib - ${project.version} - + + MOA.spss.server + moa-spss-lib + ${project.version} + + + MOA.id.server + moa-id-lib + ${project.version} + @@ -143,10 +145,10 @@ - - - - + + + + @@ -161,15 +163,15 @@ - - - - - - - - - + + + + + + + + + @@ -191,4 +193,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index b35bdc0ae..442ec855e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - 4.0.0 MOA @@ -39,41 +39,41 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - false - true - ${env.BUILD_EXECUTEABLE} - ${env.BUILD_VERSION} - 1.3 - 1.3 - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - - - - - false - maven-assembly-plugin - 2.2-beta-1 - - - id/assembly-auth.xml - id/assembly-proxy.xml - spss/assembly.xml - - - + + org.apache.maven.plugins + maven-compiler-plugin + + false + true + ${env.BUILD_EXECUTEABLE} + ${env.BUILD_VERSION} + 1.3 + 1.3 + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + + + + + + false + maven-assembly-plugin + 2.2-beta-1 + + + id/assembly-auth.xml + id/assembly-proxy.xml + spss/assembly.xml + + + @@ -93,66 +93,66 @@ - - axis - axis - 1.4 - - - - jaxen - jaxen - 1.0-FCS - - - saxpath - saxpath - 1.0-FCS - compile - - - - log4j - log4j - 1.2.7 - runtime - - - postgresql - postgresql - 7.2 - runtime - - - - javax.mail - mail - 1.4 - - - commons-fileupload - commons-fileupload - 1.1.1 - - - dav4j - dav4j - 0.1 - compile - - - httpsclient - httpsclient - JSSE-1.0 - compile - - - regexp - regexp - 1.3 - - - + + axis + axis + 1.4 + + + + jaxen + jaxen + 1.0-FCS + + + saxpath + saxpath + 1.0-FCS + compile + + + + log4j + log4j + 1.2.8 + runtime + + + postgresql + postgresql + 7.2 + runtime + + + + javax.mail + mail + 1.4 + + + commons-fileupload + commons-fileupload + 1.1.1 + + + dav4j + dav4j + 0.1 + compile + + + httpsclient + httpsclient + JSSE-1.0 + compile + + + regexp + regexp + 1.3 + + + MOA moa-common @@ -182,13 +182,13 @@ servlet-api 2.4 compile - - - javax.activation - activation - 1.1 - compile - + + + javax.activation + activation + 1.1 + compile + commons-discovery commons-discovery @@ -196,29 +196,29 @@ compile - - - iaik.prod - iaik_jce_full - 3.142_MOA - compile - + + + iaik.prod + iaik_jce_full + 3.142_MOA + compile + iaik.prod iaik_moa 1.20 compile - - iaik.prod - iaik_cms - 3.2 - compile - + + iaik.prod + iaik_cms + 3.2 + compile + iaik.prod iaik_ecc - 2.15 + 2.15 provided @@ -233,27 +233,27 @@ 0.2 compile - - iaik.prod - iaik_Pkcs11Provider - 1.2.4 - runtime - - - iaik.prod - iaik_Pkcs11Wrapper - 1.2.16 - compile - - - iaik.prod - iaik_Pkcs11Wrapper - 1.2.16 - win32 - dll - runtime - - + + iaik.prod + iaik_Pkcs11Provider + 1.2.4 + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + compile + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + win32 + dll + runtime + + xalan xalan @@ -279,8 +279,8 @@ IAIK-MOA IAIK MOA Libraries - default file://${repositoryPath} diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index edf27d123..25cb8bade 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -26,10 +26,10 @@ - - - - + + commons-discovery + commons-discovery + commons-logging commons-logging @@ -81,18 +81,22 @@ javax.servlet servlet-api + true xalan xalan + true xerces xercesImpl + true xerces xmlParserAPIs + true iaik.prod @@ -106,21 +110,25 @@ iaik.prod iaik_jce_full compile + true iaik.prod iaik_ecc compile + true iaik.prod iaik_Pkcs11Provider runtime + true iaik.prod iaik_Pkcs11Wrapper runtime + true @@ -155,7 +163,7 @@ post a - Postconfitions: + Postconditions: -- cgit v1.2.3 From 61816fafd3c37981879ee689ccfacca814cc38c1 Mon Sep 17 00:00:00 2001 From: mcentner Date: Thu, 23 Aug 2007 10:14:15 +0000 Subject: Changed assembly-descriptors to strip the version of the included libraries. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@939 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 6 ++++-- id/assembly-proxy.xml | 4 +++- pom.xml | 4 ++-- spss/assembly.xml | 6 ++++++ 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 986c4c44a..7aaa2217b 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -72,7 +72,8 @@ xerces:xercesImpl xerces:xmlParserAPIs - /endorsed + /endorsed + ${artifactId}.${extension} @@ -82,6 +83,7 @@ iaik.prod:iaik_Pkcs11Wrapper /ext + ${artifactId}.${extension} false @@ -95,7 +97,7 @@ javadoc false api-doc - /doc + /doc/moa_id true diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index cd84be4bc..7e49131d7 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -50,6 +50,7 @@ xerces:xmlParserAPIs /endorsed + ${artifactId}.${extension} @@ -59,6 +60,7 @@ iaik.prod:iaik_Pkcs11Wrapper /ext + ${artifactId}.${extension} false @@ -72,7 +74,7 @@ javadoc false api-doc - /doc + /doc/moa_id true diff --git a/pom.xml b/pom.xml index 0d12f4074..3ee3fce5a 100644 --- a/pom.xml +++ b/pom.xml @@ -277,8 +277,8 @@ - IAIK-MOA - IAIK MOA Libraries + MOA + MOA Dependencies diff --git a/spss/assembly.xml b/spss/assembly.xml index aa5666b6f..fb395df19 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -22,6 +22,8 @@ xerces:xmlParserAPIs /endorsed + + ${artifactId}.{extension} @@ -31,6 +33,8 @@ iaik.prod:iaik_Pkcs11Wrapper /ext + + ${artifactId}.${extension} @@ -70,6 +74,8 @@ xalan:xalan /tools + + ${artifactId}.${extension} /tools -- cgit v1.2.3 From 47b18ef0d41c201d77a9e5c22149cb20f759145b Mon Sep 17 00:00:00 2001 From: mcentner Date: Thu, 23 Aug 2007 12:16:36 +0000 Subject: License and version files moved to the proper locations and changed assembly descriptors accordingly. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@941 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 23 +- id/assembly-proxy.xml | 22 +- id/history.txt | 357 ++++++++++++++++++++++++++++++ id/readme_1.4.0.txt | 153 +++++++++++++ id/server/licenses/APACHE-LICENSE-2.0.txt | 202 +++++++++++++++++ id/server/licenses/IAIK-LICENSE.txt | 13 ++ 6 files changed, 745 insertions(+), 25 deletions(-) create mode 100644 id/history.txt create mode 100644 id/readme_1.4.0.txt create mode 100644 id/server/licenses/APACHE-LICENSE-2.0.txt create mode 100644 id/server/licenses/IAIK-LICENSE.txt (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 7aaa2217b..eceffa00a 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -35,24 +35,17 @@ ${basedir}/id/server/doc /doc + + ${basedir}/id + / + + history.txt + readme_${project.version}.txt + + ${basedir}/licenses / - - APACHE-LICENSE-2.0.txt - history.txt - IAIK-LICENSE.txt - readme_1.4.0.txt - - - - /ext - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper - diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 7e49131d7..20f05d775 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -21,16 +21,18 @@ ${basedir}/id/server/doc /doc - - ${basedir}/licenses - / - - APACHE-LICENSE-2.0.txt - history.txt - IAIK-LICENSE.txt - readme_1.4.0.txt - - + + ${basedir}/id + / + + history.txt + readme_${project.version}.txt + + + + ${basedir}/licenses + / + diff --git a/id/history.txt b/id/history.txt new file mode 100644 index 000000000..d6e9d4939 --- /dev/null +++ b/id/history.txt @@ -0,0 +1,357 @@ +Dieses Dokument zeigt die Veränderungen und Erweiterungen +von MOA-ID auf. + +History MOA-ID: + +===== +Version MOA-ID 1.4.0: Änderungen seit Version MOA-ID 1.3.3: + +Verbesserungen/Erweiterungen: +- Über konfigurierte Validatoren können mittels des Formularparameters + PushInfobox zusätzlich übergebene Infoboxen geprüft werden (siehe + MOA_ID_1.4_20070802.pdf). + +- IAIK Libraries aktualisiert: + Versionsnummern: + iaik-jce: Version 3.142_MOA + iaik-cms: Version 3.2 + iaikPkcs11Provider: Version 1.2.4 + iaikPkcs11Wrapper: Version 1.2.16 + ixsil: Version IXSIL-1.2.2.1 + ecc: Version v2.15 + iaik-moa: Version 1.20 + +- Neue Mindestanforderung an Java: Version 1.4.0 (1.3.* wird nicht mehr unterstützt) + +- Axis Libraries aktualisiert (auf Version 1.4) + +===== +Version MOA-ID 1.3.3: Änderungen seit Version MOA-ID 1.3.2: + +Verbesserungen/Erweiterungen: +- Unterstützung der Parameterübertragung mittels multipart/form-data in den + Servlets VerifyIdentityLinkServlet (Entgegenname der Personenbindung von der + BKU) und VerifyAuthBlockServlet (Entgegenname des signierten AuthBlocks von + der BKU). Diese Form der Parameterübertragung wurde von Security Layer + Version 1.2 verpflichtend eingeführt. Damit funktioniert MOA-ID nun auch mit + Security Layer Requests der Version 1.2, eine Voraussetzung für die + Verwendung von MOA ID im Bereich der Privatwirtschaft (wbPK als eindeutiges + Personenkennzeichen). + +- Die Templates für den sogenannten AuthBlock, also jenes Dokument, das im Zuge + der Anmeldung vom Bürger/Kunden elektronisch signiert wird, wurden erweitert, + dass sowohl aktuelle BKU (strenge Prüfung im Viewer, Anzeigeformat SLXHTML) + als auch ältere BKU (z.B. hot:Sign Version 1.3 mit einem propriätären + HTML-Dialekt als Anzeigeformat) unterstützt werden. + +Fixes: +- Parsen der Personenbindung aus dem an das VerifyIdentityLinkServlet gesendeten + InfoboxReadResponse funktioniert nun auch, wenn der InfoboxReadResponse ein + anderes als die in den MOA-Konstanten vordefiniertes NS-Präfix verwendet. + +===== +Version MOA-ID 1.3.2: Änderungen seit Version MOA-ID 1.3.1: + +Verbesserungen/Erweiterungen: +- In der URL an die Servlets SelectBKU bzw. StartAuthentication kann der URL- + Parameter Target nun alternativ zur bisher möglichen Form des Bereichskürzels + laut E-Gov BerAbgrVO (z.B. BW für Bauen und Wohnen) auch in der Variante + inklusive Präfix (z.B. urn:publicid:gv.at:cdid+BW für Bauen und Wohnen) + angegeben werden. + +===== +Version MOA-ID 1.3.1: Änderungen seit Version MOA-ID 1.3.1D01: + +Verbesserungen/Erweiterungen: +- Templates zur Gestaltung der Seiten "Auswahl der Bürgerkartenumgebung" + und "Anmeldung mit Bürgerkarte" können nun auch über die + MOA-ID-Konfigurationsdatei geladen werden. + +- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage + crlSign-Bit nicht gesetzt ist, allerdings nur wenn das Zertifikat + ein Trust-Anchor ist. + +- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die + "IssuingDistributionPoint"-Extension fehlt. + +Fixes: +- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*) +- bPK Berechnung (bPK wurde bisher falsch berechnet) +- ist eine Online-Applikation so konfiguriert, dass die Stammzahl + nicht an die nachfolgende Applikation weitergegeben werden darf + (Parameter "provideStammzahl" hat den Wert "false"), so wird die + Stammzahl zwar aus den Anmeldedaten ausgeblendet, nicht aber aus + der Personenbindung (wenn Parameter "provideIdentityLink" auf + den Wert "true" gesetzt ist. Ab Version 1.3.1 wird die Stammzahl + auch aus der Personenbindung entfernt, wenn die Option + "provideStammzahl" aud "false" gesetzt ist. +- Die Transformationen selektieren bei der Jahreszahl des Geburtsdatums + nur die letzen beiden Stellen für die Anzeige im Trusted Viewer. + Ab Verison 1.3.1 wird die volle Jahreszahl (alle vier Stellen) angezeigt. +- Überprüfung, ob Geburtsdatum und Name aus dem signierten Login-Request + mit den entsprechenden Daten aus der Personenbindung übereinstimmen. + +- neue IAIK-JCE-Library: version 3.14 + +===== +Version MOA-ID 1.3.1D01: Änderungen seit Version MOA-ID 1.3.0: + +Verbesserungen/Erweiterungen: +- Produktversion wird zur Wiedererkennbarkeit in Manifest.mf der .war Dateien eingetragen + +- IAIK-MOA: CRL wird nun auch akzeptiert, wenn im CLRSigner-Zertifikat KeyUsage crlSign-Bit nicht gesetzt ist, + allerdings nur wenn das Zertifikat ein Trust-Anchor ist. + +- IAIK-MOA: Eine indirekte CRL wird nun auch akzeptiert, wenn die "IssuingDistributionPoint"-Extension fehlt + +Fixes: +- Logging: commons-logging-1.0.4-Libraries (unterstützt auch Tomcat 5*) + +===== +Version MOA-ID 1.3.0: Änderungen seit Version MOA-ID 1.3.0d01: + +Verbesserungen/Erweiterungen: +- Update der Proxykompnente auf MOA-ID Modus (wbPK) + +- Transformationen können nun auch je Onlineapplikation gesetzt werden + +- Update PKI auf OCSP (für E-CARD) + +- Update der Zertifikatsspeicher und Trustprofile + +- IAIK Libraries wieder nur Vollversion + Versionsnummern: + iaik-jce: Version 3.13_3.13_NONEwithRSA (MOA-ID kann nun auch mit JDK1.5 verwendet werden) + iaik-cms: Version 3.2 + iaikPkcs11Provider: Version 1.1.9 + iaikPkcs11Wrapper: Version 1.2.14 + ixsil: Version IXSIL-1_2_2 + ecc: Version 2.0 + +===== +Version MOA-ID 1.3.0d01: Änderungen seit Version MOA-ID 1.2d10: + +- Update der Authentisierungskomponente auf MOA-WID Modus (wbPK). +- Fixes + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id= + +===== +Version MOA-ID 1.2.0d10: Änderungen seit Version MOA-ID 1.2d09: + +- Aufspalten der IAIK-Libraries in zwei Verzeichnisse, die jeweils + die entsprechenden Voll- bzw. die Evaluierungsversionen enthalten. + Versionsnummern: + iaik-jce: Version 3.13 + iaik-cms: Version 3.2 + iaikPkcs11Provider: Version 1.1.9 + iaikPkcs11Wrapper: Version 1.2.14 + ixsil: Version IXSIL-1_2_1_improvedC14N + ecc: Version 2.0 + +- Anpassen der build.xml-Datei an diese Struktur. + +===== +Version MOA-ID 1.2.0d10: Änderungen seit Version MOA-ID 1.2d09: + +- Aufspalten der IAIK-Libraries in zwei Verzeichnisse, die jeweils + die entsprechenden Voll- bzw. die Evaluierungsversionen enthalten. + Versionsnummern: + iaik-jce: Version 3.13 + iaik-cms: Version 3.2 + iaikPkcs11Provider: Version 1.1.9 + iaikPkcs11Wrapper: Version 1.2.14 + ixsil: Version IXSIL-1_2_1_improvedC14N + ecc: Version 2.0 + +- Anpassen der build.xml-Datei an diese Struktur. + +===== +Version MOA-ID 1.2.0d12: Änderungen seit Version MOA-ID 1.2d09: + +Verbesserungen/Erweiterungen: +- Proxy ermöglicht nun auch Anmeldungen an WebDAV (RFC 2518) Anwendungen + +- Der MOA-ID-PROXY ermöglicht nun bei Basic Authentication auch eine + etwas gelockertere Vorgangsweise bei der Anmeldung an einen Online- + Applikation: So ist es jetzt zusätzlich zur fixen Vorgabe von Benutzernamen + und Passwort möglich das Passwort im Browser eingeben zu lassen oder + sogar eine freie Zuordnung zum Benutzer zu erlauben (Vorteil: es + entfällt die sonst notwendige Wartung der Identities, bzw. das + Mitziehen von durch die Benutzer hervogerufenen Passwortänderungen). + Die Vorgangsweise ist konfigurierbar. + +Fixes: +- Es gab Umstände, bei denen der MOA-ID-PROXY Cookies verwarf. + Dieses Problem ist nun behoben + +- Ergänzung des ausgelieferten certstores um wichtige Zertifikate. + +===== +Version MOA-ID 1.2.0d09: Änderungen seit Version MOA-ID 1.2d08: + +- Austausch der Bibliothek iaik-moa-full.jar + (ECDSA Signature Encoding) + +- Ergänzung des ausgelieferten certstores um wichtige Zertifikate. + +===== +Version MOA-ID 1.2.0d08: Änderungen seit Version MOA-ID 1.2d07: + +- Anpassung des nun in der Personenbindung korrekt verwendeten +ECDSA Namespaces von http://www.w3.org/2004/01/xmldsig-more# +(zwischenzeitlich verwendeter NS) auf +http://www.w3.org/2001/04/xmldsig-more# (gemäß Draft) + +- Update auf die API Version 1.2.0D04 von MOA-SPSS +===== + +Version MOA-ID 1.2.0d07: Änderungen seit Version MOA-ID 1.2d06: + +- Erweiterung um ECC Funktionalität, so dass ECC Karten + (wie z.B. MAESTRO Karten) mit funktionieren + +- Upgrade des Parsers und der XSLT Transform Engine: Die Version + baut nun auf Xerces in der Version xerces-j-2.4.0 und Xalan + in der Version xalan-j-2.5.1 auf. + +===== +Version MOA-ID 1.2.0d06: Änderungen seit Version MOA-ID 1.2d05: + +- Automatische Erkennung des Encodings der BKU Auswahldaten. + Eine Unabhängigkeit von locale und default encoding Einstellungen + des JDK wurde damit bei der Darstellung der Daten der Auswahlseite + erreicht. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=175 + +===== +Version MOA-ID 1.2.0d05: Änderungen seit Version MOA-ID 1.2d04: + +Verbesserungen/Erweiterungen: + +- Vorlagen für Templates zur Anpassung des Erscheinungsbilds von + MOA-ID wurden hinzugefügt. + +- Kompabilität mit aktueller HotSign Version 1.2SR4rev3 wurde erreicht. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=140 + +- Upgrade auf neue Loging Bibliothek log4j 1.2.8 + +- Update der Dokumentation + +- Tests mit aktueller Tomcat-Version jakarta-tomcat-4.1.30.zip (Windows) + sowie jakarta-tomcat-4.1.30-LE-jdk14.zip (Linux) wurden durchgeführt. + +===== +Version MOA-ID 1.2.0d04: Änderungen seit Version MOA-ID 1.2d03: + +Verbesserungen/Erweiterungen: + +- Neue stimmige und übersichtlichere Konfigurationen wurden + erstellt. Trustprofile und certstore für neue Testbürgerkarten + a.sign test government und SeLaNext wurden hinzugefügt. + + +Fixes: +- StackOverflowError bei a.sign test government Karten behoben + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=131 + + +Version MOA-ID 1.2.0d3: Änderungen seit Version MOA-ID 1.1.1: + +Verbesserungen/Erweiterungen: +- Umstellung von vPK auf bPK; von ZMR auf Stammzahl. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=70 +  +- Anpassbare JSP Errorpage und Messagepage für Proxy und Auth + Damit die Formatierungen der Benutzermeldungen an die Kundenwünsche + und das CI der Kunden angepasst werden können, wird JSP + Technologie verwendet. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=100 + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=102 + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=103 + +- Ausgabe der gen. Ursache falls eine Signaturprüfung fehlschlägt. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=101 + +- Umschaltung CertifiedKeypair / SecureSignatureKeypair + Durch die Angabe des Attributs ‚keyBoxIdentifier’ im Element + OnlineApplication eine Auswahl des Schlüsselpaars erfolgen. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=105 +  +- Anpassbare JSP Errorpage für MOA-ID Proxy und MOA-ID Auth + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=70 + +- Erweiterung des AuthBlocks (SAMLAssertion) um Geburtsdatum + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=114 + +- Ergänzung der mitgelieferten Konfiguration + (certstore, trustprofiles auch für Testbürgerkarten) + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=120  +  +Fixes: +- Daten die aus MOA-ID-PROXY an eine OA mittels der + Authentisierungsvariante ParamAuth weitergegeben werden, + müssen URL-Encoded übermittelt werden. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=104 + +- Meldung: Fehlerhafter Wert für "DirectoryCertStoreParamet... + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=110 + +===== + +Version MOA-ID 1.1.1: Änderungen seit Version MOA-ID 1.1: + +- Fehlermeldungen werden nun im Internet-Explorer unabhängig von dessen + Einstellungen bzgl. Fehlermeldungshandling ("Kurze HTTP Fehlermeldungen + anzeigen") korrekt dargestellt. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=26 + +- Angabe eine speziellen DATA-URL Präfix ist nun möglich (sinnvoll wenn + ein Webserver vorgeschaltet werden soll) + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=63 + +- Verbesserung der Dokumentation in vielen Details + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=24 + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=25 + +- Ergänzung/Korrektur des WSDL-Files von MOA-ID + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=38 + +- Die ausgelieferte Default Konfiguration wurde verbessert. + ~ Padangaben werden nun relativ zum Konfigurationsfile MOA-ID + ausgewertet. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=49 + ~ Default Certstore wurde um eine Reihe von Zertifikaten ergänzt. + ~ Zwei verschiedene Signaturprüfprofile (für Personenbindung und + Authentisierungsdaten) werden nun verwendet. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=40 + +- Die aktuelle Version der MOA-SP Bibliotheken (moa-spss-1.2d01) wurden + integriert. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=62 + +- Es ist nun per Konfiguration möglich HTTPS Verbindungen auf die + Frontend-Servlets zu erlauben. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=48 + +- Falsche Fehlermeldung beim Aufruf von VerifyIdentityLink wurde behoben. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=50 + +- Über die Angeabe des Attributs 'loginParameterResolverConfiguration' kann + dem LoginParameterResolver der PROXY Komponente eine + Initialisierungsparameter mitgegeben werden. + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=71 + +- FAQ wurde ergänzt + https://forge.cio.gv.at/bugzilla/show_bug.cgi?id=69 + + +- Diverse Detailverbesserungen: + https://forge.cio.gv.at/bugzilla/query.cgi + + + + + + + diff --git a/id/readme_1.4.0.txt b/id/readme_1.4.0.txt new file mode 100644 index 000000000..24f06f6bc --- /dev/null +++ b/id/readme_1.4.0.txt @@ -0,0 +1,153 @@ +=============================================================================== +MOA ID Version 1.4.0 - Wichtige Informationen zur Installation +=============================================================================== + +------------------------------------------------------------------------------- +A. Neuerungen/Änderungen +------------------------------------------------------------------------------- + +MOA ID Version 1.4.0 bringt folgende Neuerungen: + +- Über konfigurierte Validatoren können mittels des Formularparameters + PushInfobox zusätzlich übergebene Infoboxen geprüft werden. + +- Unterstützung der Parameterübertragung mittels multipart/form-data in den + Servlets VerifyIdentityLinkServlet (Entgegennahme der Personenbindung von der + BKU) und VerifyAuthBlockServlet (Entgegennahme des signierten AuthBlocks von + der BKU). Diese Form der Parameterübertragung wurde von Security Layer + Version 1.2 verpflichtend eingeführt. Damit funktioniert MOA-ID nun auch mit + Security Layer Requests der Version 1.2, was eine Voraussetzung für die + Verwendung von MOA ID im Bereich der Privatwirtschaft (wbPK als eindeutiges + Personenkennzeichen) ist. + +- Ab Version 2.6.x des trustDesk basic von IT Solution GmbH werden Inhalte im + Secure Viewer spezifikationsgemäß und damit strenger als bisher geprüft. Dies + machte es erforderlich Templates für den sogenannten AuthBlock, also jenes + Dokument, das im Zuge der Anmeldung vom Bürger/Kunden elektronisch signiert + wird anzupassen. Damit aus Kompatibilitätsgründen auch noch (zum Beispiel für + eine Übergangsfrist) Versionen < 2.6.x oder die Umsetzung von bdc (hot:Sign + Version 1.3) funktionieren, wurden die Musterkonfigurationen so erweitert, + dass sowohl aktuelle Bürgerkartenumgebungen als auch OPTIONAL ältere BKU + unterstützt werden. + +------------------------------------------------------------------------------- +B. Gründe für ein Update +------------------------------------------------------------------------------- + +Sie sollten Ihre bestehende, ältere Installation von MOA ID auf die Version +1.4.0 aktualisieren, wenn einer der folgenden Punkte zutrifft: + +- Sie möchten Ihre Installation für Anwendungen im Bereich der Privatwirtschaft + verwenden (Verwendung des wirtschaftsbereichspezifischen Personenkennzeichens + wbpk) oder verwenden explizit multipart/form-data Parameterübertragung von + Security Layer Version 1.2. + +- Es sollen aktuelle Bürgerkartenumgebungen verwendet werden. + +- Sie möchten Ihre Installation mit Templates für den AuthBlock (also jenes + Dokument, das im Zuge der Anmeldung vom Bürger/Kunden elektronisch signiert + wird) betreiben, die sowohl von aktuellen als auch von älteren Bürgerkarten- + umgebungen (BKU) unterstützt werden. + +------------------------------------------------------------------------------- +C. Durchführung des Updates +------------------------------------------------------------------------------- + +............................................................................... +C.1 Durchführung eines Updates von Version 1.3.1, 1.3.2 oder 1.3.3 +............................................................................... + +1. Stoppen Sie den Tomcat, in dem Ihre bisherige Installation betrieben wird. + Fertigen Sie eine Sicherungskopie Ihrer kompletten Tomcat-Installation an. + +2. Entpacken Sie die Distribution von MOA ID Auth (moa-id-auth-1.3.3.zip) in + ein temporäres Verzeichnis, in weiterer Folge als MOA_ID_AUTH_INST + bezeichnet. + +3. Wechseln Sie in jenes Verzeichnis, das die Webapplikation von MOA ID Auth + beinhaltet (für gewöhnlich ist dieses Verzeichnis CATALINA_HOME_ID/webapps, + wobei CATALINA_HOME_ID für das Basisverzeichnis der Tomcat-Installation + für MOA ID steht). Löschen Sie darin sowohl die Datei moa-id-auth.war als + auch das komplette Verzeichnis moa-id-auth. + +4. Kopieren Sie die Datei MOA_ID_AUTH_INST/moa-id-auth.war nach + CATALINA_HOME_ID/webapps. + +5. Kopieren Sie die vier Dateien aus dem Verzeichnis + MOA_ID_AUTH_INST/conf/moa-id/transforms in das Verzeichnis transforms Ihres + Stammverzeichnisses für die MOA ID Konfiguration (für gewöhnlich lautet + dieses Stammverzeichnis CATALINA_HOME_ID/conf/moa-id; in weiterer Folge wird + davon ausgegangen). + +6. Kopieren Sie die vier Dateien aus dem Verzeichnis + MOA_ID_AUTH_INST/conf/moa-spss/profiles in das Verzeichnis profiles Ihres + Stammverzeichnisses für die MOA SPSS Konfiguration (für gewöhnlich lautet + dieses Stammverzeichnis CATALINA_HOME_SPSS/conf/moa-spss, wobei + CATALINA_HOME_SPSS für das Basisverzeichnis der Tomcat-Installation + für MOA SPSS steht; wenn Sie MOA SPSS nicht als eigenes Webservice + betreiben, sondern es von MOA ID über die API-Schnittstelle angesprochen + wird, lautet dieses Stammverzeichnis für gewöhnlich + CATALINA_HOME_ID/conf/moa-spss; in weiterer Folge wird von letzterer + Variante ausgegangen). + +7. Sollen zusätzliche Templates für ältere Bürgerkartenumgebungen aktiviert + werden, öffnen Sie die XML-Konfiguration von MOA ID (für gewöhnlich finden + Sie diese XML-Datei direkt im Stammverzeichnis für die MOA ID Konfiguration, + z.B. CATALINA_HOME_ID/conf/moa-id/SampleMOAIDConfiguration.xml); führen Sie + folgende Modifikationen an der XML-Konfiguration durch: + + a. Ändern Sie die applikationsübergreifende Konfiguration der AuthBlock + Transformationen. Sie finden diese Konfiguration im XML-Element + /MOA-IDConfiguration/AuthComponent/SecurityLayer. Fügen Sie zusätzlich zum + bisherigen Inhalt dieses Elements (für gewöhnlich ein Element + TransformsInfo, dessen Attribut filname den Wert + transforms/TransformsInfoAuthBlockText.xml aufweist) ein Element + TransformsInfo an, dessen Attribut filename auf die Datei für ältere BKU + zeigt. Sie können auch auf die vordefinierten Elemente aus den + Musterkonfigurationen dieser Distribution ( + MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml) zurückgreifen. + + b. Fügen Sie Profilbezeichner für die Transformationsprofile in der + Konfiguration für MOA SP an. Sie finden diesen Bezeichner im XML- + Element /MOA-IDConfiguration/AuthComponent/MOA-SP/VerifyAuthBlock. + Hängen Sie ein Element VerifyTransformsInfoProfileID an, das für die Über- + prüfung der Transformation älterer BKU vorgesehen ist. + Siehe auch Inhalt des Elements VerifyAuthBlock aus der Musterkonfiguration + dieser Distribution ( + MOA_ID_AUTH_INST/conf/moa-id/SampleMOAIDConfiguration.xml). + + c. Ändern Sie gegebenenfalls die applikationsspezifische Konfiguration + der Authblock-Tranformationen. Führen Sie dazu die folgende Tätigkeit + für jedes XML-Element /MOA-IDConfiguration/OnlineApplicaton/AuthComponent + durch: Fügen Sie zusätzlich zu einem bestehenden Element TransformsInfo + ein Elemnet TransformsInfo an, das die Transformation für ältere BKU + enthält - gleich wie dies bereits in Schritt a. durchgeführt wurde (wenn + Sie dieses Element nicht vorfinden, oder es auskommentiert ist, muss + Schritt c. nicht durchgeführt werden). + + Öffnen Sie die XML-Konfiguration von MOA SPSS (für gewöhnlich finden Sie + XML-Datei direkt im Stammverzeichnisses für die MOA SPSS Konfiguration, z.B. + CATALINA_HOME_ID/conf/moa-spss/SampleMOASPSSConfiguration.xml); führen Sie + folgende Modifikationen an der XML-Konfiguration durch: + + a. Ändern Sie die konfigurierten Profile für die zulässigen Transformationen + über die signierten Daten. Sie finden diese Profile am Ende der XML-Konfi- + guration von MOA SPSS (Elemente des Namens + cfg:VerifyTransformsInfoProfile). Fügen Sie zusätzlich zu den vorkommenden + Elementen dieses Namens (für gewöhnlich zwei Elemente) zwei weitere + Elemente dieses Namens hinzu, die die Profile für die älteren Bürger- + kartenumgebungen aufnehmen - diese sind durch den Namensteil "_deprecated" + gekennzeichnet (siehe auch Musterkonfigurationen dieser Distribution + MOA_ID_AUTH_INST/conf/moa-spss/SampleMOASPSSConfiguration.xml). + +8. Starten Sie den Tomcat neu, achten Sie auf eventuelle Fehlermeldungen im + Logging von MOA ID beim Einlesen der erneuerten Konfiguration. + +............................................................................... +C.2 Durchführung eines Updates von einer älteren Version +............................................................................... + +Bitte führen Sie eine Neuinstallation von MOA ID laut Handbuch durch und passen +Sie die mitgelieferte Musterkonfiguration entsprechend Ihren Bedürfnissen unter +Zuhilfenahme Ihrer bisherigen Konfiguration an. + diff --git a/id/server/licenses/APACHE-LICENSE-2.0.txt b/id/server/licenses/APACHE-LICENSE-2.0.txt new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/id/server/licenses/APACHE-LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/id/server/licenses/IAIK-LICENSE.txt b/id/server/licenses/IAIK-LICENSE.txt new file mode 100644 index 000000000..c0db63b22 --- /dev/null +++ b/id/server/licenses/IAIK-LICENSE.txt @@ -0,0 +1,13 @@ +IAIK MOA Runtime Lizenz + +Stiftung SIC gewährt dem Lizenznehmer eine nicht-exklusive, nicht-übertragbare +Runtime Lizenz für die "IAIK MOA" Module im Kontext von MOA SP/SS und MOA ID. +Alle Versuche, Teile oder die kompletten IAIK Crypto Toolkits, die zusammen +mit dem MOA Produktbündel ausgeliefert werden, für andere Zwecke als jenem +für Applikationen im MOA Kontext zu verwenden, sind nicht erlaubt. Auch weitere +Versuche, die sich auf die Entwicklung von Anwendungen , oder aber darüber hinaus +auf die Schaffung eines eigenen Toolkits, oder die Aufnahme in ein weiters +weiteres Toolkit beziehen, sind nicht erlaubt. +Die hier beschriebene Runtime Lizenz ist nicht übertragbar auf weitere +Vertragspartner des Kunden, Personen, Organisationen oder Unternehmen +außerhalb der Organisation des Lizenznehmers. -- cgit v1.2.3 From ef5f57de87191f8296359c4141d562453d15ca20 Mon Sep 17 00:00:00 2001 From: mcentner Date: Tue, 28 Aug 2007 07:35:22 +0000 Subject: The xalan.jar of the official xalan distribution and the one in the central repository differ. So, we are going to include the official one in our own distribution to prevent from problems with different versions in the endorsed directory of the servlet container or jre. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@966 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common-test/pom.xml | 2 +- common/pom.xml | 4 ++- id/assembly-auth.xml | 2 +- id/assembly-proxy.xml | 2 +- id/server/auth/pom.xml | 2 +- id/server/idserverlib/pom.xml | 2 +- id/server/proxy/pom.xml | 2 +- pom.xml | 18 ++++++++++--- .../xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar | Bin 0 -> 3078601 bytes .../xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 | 1 + .../xalan/2.7.0/xalan-2.7.0.jar.sha1 | 1 + .../xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom | 6 +++++ .../xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 | 1 + .../xalan/2.7.0/xalan-2.7.0.pom.sha1 | 1 + repository/xalan-bin-dist/xalan/maven-metadata.xml | 11 ++++++++ .../xalan-bin-dist/xalan/maven-metadata.xml.md5 | 1 + .../xalan-bin-dist/xalan/maven-metadata.xml.sha1 | 1 + spss/assembly-lib.xml | 8 +++--- spss/assembly.xml | 28 ++++++++++++++------- spss/server/serverlib/pom.xml | 3 ++- spss/server/serverws/pom.xml | 2 +- 21 files changed, 73 insertions(+), 25 deletions(-) create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 create mode 100644 repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 create mode 100644 repository/xalan-bin-dist/xalan/maven-metadata.xml create mode 100644 repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 create mode 100644 repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 (limited to 'id/assembly-proxy.xml') diff --git a/common-test/pom.xml b/common-test/pom.xml index 6c605f1b5..69f653348 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -38,7 +38,7 @@ true - xalan + xalan-bin-dist xalan diff --git a/common/pom.xml b/common/pom.xml index 85b206ee9..f4eacf8e9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -40,8 +40,9 @@ saxpath - xalan + xalan-bin-dist xalan + compile true @@ -52,6 +53,7 @@ xerces xmlParserAPIs + compile true diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index eceffa00a..bde8a7bba 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -61,7 +61,7 @@ - xalan:xalan + xalan-bin-dist:xalan xerces:xercesImpl xerces:xmlParserAPIs diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 20f05d775..a24e3d217 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -47,7 +47,7 @@ - xalan:xalan + xalan-bin-dist:xalan xerces:xercesImpl xerces:xmlParserAPIs diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index d0c8c1612..b3bb1f8b0 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -86,7 +86,7 @@ provided - xalan + xalan-bin-dist xalan provided diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 7c30ddbe2..1fbcfeb0c 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -44,7 +44,7 @@ xmlParserAPIs - xalan + xalan-bin-dist xalan diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index ee8c38c29..24024c9c7 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -88,7 +88,7 @@ provided - xalan + xalan-bin-dist xalan provided diff --git a/pom.xml b/pom.xml index 1938944e9..ff5fb98c5 100644 --- a/pom.xml +++ b/pom.xml @@ -253,12 +253,24 @@ win32 dll runtime - + + + xalan + xalan + 2.7.0 + compile + + - xalan + xalan-bin-dist xalan 2.7.0 - compile + runtime xerces diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar new file mode 100644 index 000000000..979ee761c Binary files /dev/null and b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar differ diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 new file mode 100644 index 000000000..5a623f9d2 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.md5 @@ -0,0 +1 @@ +126c0c876a6b9726cfdd43f052923660 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 new file mode 100644 index 000000000..c8b946d9e --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.jar.sha1 @@ -0,0 +1 @@ +10f170da8dfbcdcc4098131ba773710f0ba7aef1 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom new file mode 100644 index 000000000..a957201e4 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom @@ -0,0 +1,6 @@ + + 4.0.0 + xalan-bin-dist + xalan + 2.7.0 + \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 new file mode 100644 index 000000000..892d7635e --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.md5 @@ -0,0 +1 @@ +fb90bb055826496abcc3bdbd07c78088 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 new file mode 100644 index 000000000..a0286a312 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/2.7.0/xalan-2.7.0.pom.sha1 @@ -0,0 +1 @@ +c58c98128a376191f6ddcd88b29c4adcd0f59dfb \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml b/repository/xalan-bin-dist/xalan/maven-metadata.xml new file mode 100644 index 000000000..8564c8faa --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml @@ -0,0 +1,11 @@ + + xalan-bin-dist + xalan + 2.7.0 + + + 2.7.0 + + 20070828063912 + + \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 b/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 new file mode 100644 index 000000000..2dfacdcec --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml.md5 @@ -0,0 +1 @@ +ed0190e78f5dfbd8bb0906fe3d62948e \ No newline at end of file diff --git a/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 new file mode 100644 index 000000000..3b9fc56e6 --- /dev/null +++ b/repository/xalan-bin-dist/xalan/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +8ac861f6a88f53ac4807dd7de8d958d760165eaf \ No newline at end of file diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 669ef471f..0ca602f4a 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -17,7 +17,7 @@ - xalan:xalan + xalan-bin-dist:xalan xerces:xercesImpl xerces:xmlParserAPIs @@ -47,7 +47,7 @@ MOA:moa-common - xalan:xalan + xalan-bin-dist:xalan xerces:xercesImpl xerces:xmlParserAPIs iaik.prod:iaik_ecc @@ -62,7 +62,7 @@ iaik.prod:iaik_Pkcs11Wrapper:dll:win32 /lib/win32 - pkcs11wrapper.dll + pkcs11wrapper.${extension} moa-spss.${extension} @@ -92,7 +92,7 @@ iaik.prod:iaik_moa log4j:log4j - xalan:xalan + xalan-bin-dist:xalan /tools diff --git a/spss/assembly.xml b/spss/assembly.xml index d861b8ab9..a52860016 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -17,7 +17,7 @@ - xalan:xalan + xalan-bin-dist:xalan xerces:xercesImpl xerces:xmlParserAPIs @@ -36,18 +36,28 @@ ${artifactId}.${extension} - - - iaik.prod:iaik_Pkcs11Wrapper:dll:win32 - - /pkcs11/win32 - pkcs11wrapper.dll - moa-spss.${extension} false + + + MOA.spss.server:moa-spss-lib + + + true + + + + iaik.prod:iaik_Pkcs11Wrapper:dll:win32 + + /pkcs11/win32 + pkcs11wrapper.${extension} + + + + MOA.spss.server:moa-spss-lib @@ -71,7 +81,7 @@ iaik.prod:iaik_moa log4j:log4j - xalan:xalan + xalan-bin-dist:xalan /tools diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 620d3ebd4..1a169b357 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -56,8 +56,9 @@ provided - xalan + xalan-bin-dist xalan + compile xerces diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 5a5afdebd..7fa109145 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -89,7 +89,7 @@ provided - xalan + xalan-bin-dist xalan provided -- cgit v1.2.3 From 6be52df44678056f95d36f08361b94e2befeb044 Mon Sep 17 00:00:00 2001 From: mcentner Date: Tue, 28 Aug 2007 11:53:33 +0000 Subject: Xalan artifact serializer.jar added. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@968 d688527b-c9ab-4aba-bd8d-4036d912da1d --- common-test/pom.xml | 12 ++- common/pom.xml | 10 ++- id/assembly-auth.xml | 3 +- id/assembly-proxy.xml | 3 +- id/server/auth/pom.xml | 10 ++- id/server/idserverlib/pom.xml | 8 +- id/server/proxy/pom.xml | 10 ++- pom.xml | 52 ++++++------ .../serializer/2.7.0/serializer-2.7.0.jar | Bin 0 -> 188993 bytes .../serializer/2.7.0/serializer-2.7.0.jar.md5 | 1 + .../serializer/2.7.0/serializer-2.7.0.jar.sha1 | 1 + .../serializer/2.7.0/serializer-2.7.0.pom | 6 ++ .../serializer/2.7.0/serializer-2.7.0.pom.md5 | 1 + .../serializer/2.7.0/serializer-2.7.0.pom.sha1 | 1 + .../xalan-bin-dist/serializer/maven-metadata.xml | 11 +++ .../serializer/maven-metadata.xml.md5 | 1 + .../serializer/maven-metadata.xml.sha1 | 1 + .../xml-apis/2.7.0/xml-apis-2.7.0.jar | Bin 0 -> 194205 bytes .../xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 | 1 + .../xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 | 1 + .../xml-apis/2.7.0/xml-apis-2.7.0.pom | 6 ++ .../xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 | 1 + .../xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 | 1 + .../xalan-bin-dist/xml-apis/maven-metadata.xml | 11 +++ .../xalan-bin-dist/xml-apis/maven-metadata.xml.md5 | 1 + .../xml-apis/maven-metadata.xml.sha1 | 1 + spss/assembly-lib.xml | 89 ++------------------- spss/assembly.xml | 86 +------------------- spss/server/serverlib/pom.xml | 8 +- spss/server/serverws/pom.xml | 10 ++- 30 files changed, 139 insertions(+), 208 deletions(-) create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5 create mode 100644 repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1 create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml.md5 create mode 100644 repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 create mode 100644 repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5 create mode 100644 repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1 (limited to 'id/assembly-proxy.xml') diff --git a/common-test/pom.xml b/common-test/pom.xml index 69f653348..697cc04b8 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -37,17 +37,21 @@ iaik_jce_full true + + xerces + xercesImpl + xalan-bin-dist xalan - xerces - xercesImpl + xalan-bin-dist + xml-apis - xerces - xmlParserAPIs + xalan-bin-dist + serializer diff --git a/common/pom.xml b/common/pom.xml index f4eacf8e9..c51265c96 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -51,10 +51,16 @@ true - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis compile true + + xalan-bin-dist + serializer + runtime + true + diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index bde8a7bba..c92e30179 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -63,7 +63,8 @@ xalan-bin-dist:xalan xerces:xercesImpl - xerces:xmlParserAPIs + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer /endorsed ${artifactId}.${extension} diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index a24e3d217..6817b70be 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -49,7 +49,8 @@ xalan-bin-dist:xalan xerces:xercesImpl - xerces:xmlParserAPIs + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer /endorsed ${artifactId}.${extension} diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index b3bb1f8b0..54f7ee54e 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -98,8 +98,14 @@ provided - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis + + provided + + + xalan-bin-dist + serializer provided diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml index 1fbcfeb0c..22dadc5b9 100644 --- a/id/server/idserverlib/pom.xml +++ b/id/server/idserverlib/pom.xml @@ -40,13 +40,17 @@ xercesImpl - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis xalan-bin-dist xalan + + xalan-bin-dist + serializer + junit junit diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index 24024c9c7..3c29d62b5 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -100,11 +100,17 @@ provided - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis provided + + xalan-bin-dist + serializer + + provided + diff --git a/pom.xml b/pom.xml index ff5fb98c5..7746a6891 100644 --- a/pom.xml +++ b/pom.xml @@ -254,36 +254,42 @@ dll runtime + + xerces + xercesImpl + 2.7.1 + compile + + - xalan - xalan - 2.7.0 - compile + xalan-bin-dist + xml-apis + 2.7.0 + runtime - - xalan-bin-dist - xalan - 2.7.0 - runtime - - - xerces - xercesImpl - 2.7.1 - compile - - - xerces - xmlParserAPIs - 2.6.2 - compile - + or jre endorsed directory. --> + + xalan-bin-dist + xalan + 2.7.0 + runtime + + + xalan-bin-dist + serializer + 2.7.0 + runtime + diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar new file mode 100644 index 000000000..7cd806964 Binary files /dev/null and b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar differ diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5 new file mode 100644 index 000000000..42964c31e --- /dev/null +++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.md5 @@ -0,0 +1 @@ +35aa6a56662458d9dc28a9b628f84847 \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1 new file mode 100644 index 000000000..8bcab225d --- /dev/null +++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.jar.sha1 @@ -0,0 +1 @@ +85ddd38e4cdbc22fb6c518f3d35744336da6fbfd \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom new file mode 100644 index 000000000..87bfdd006 --- /dev/null +++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom @@ -0,0 +1,6 @@ + + 4.0.0 + xalan-bin-dist + serializer + 2.7.0 + \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5 new file mode 100644 index 000000000..7b1cf9d6d --- /dev/null +++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.md5 @@ -0,0 +1 @@ +b40d1a414676a4f358f157c6898664bb \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1 b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1 new file mode 100644 index 000000000..2ebd5256a --- /dev/null +++ b/repository/xalan-bin-dist/serializer/2.7.0/serializer-2.7.0.pom.sha1 @@ -0,0 +1 @@ +9e7770973422a62b4a3ae7ea5c20b6d06b463528 \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml b/repository/xalan-bin-dist/serializer/maven-metadata.xml new file mode 100644 index 000000000..3b2919728 --- /dev/null +++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml @@ -0,0 +1,11 @@ + + xalan-bin-dist + serializer + 2.7.0 + + + 2.7.0 + + 20070828113437 + + \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5 b/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5 new file mode 100644 index 000000000..1e74cd099 --- /dev/null +++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml.md5 @@ -0,0 +1 @@ +618746ccbd308489eec0a5f6ceafb565 \ No newline at end of file diff --git a/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1 new file mode 100644 index 000000000..4463aea5b --- /dev/null +++ b/repository/xalan-bin-dist/serializer/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +de784579e439fb38440facdd43d70c159434cc44 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar new file mode 100644 index 000000000..243eaeaeb Binary files /dev/null and b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar differ diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 new file mode 100644 index 000000000..739ea21f7 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.md5 @@ -0,0 +1 @@ +2e7aed876c51af3ee6a23ed524180d37 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 new file mode 100644 index 000000000..0916b2415 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.jar.sha1 @@ -0,0 +1 @@ +dc7315e359b5e43f20131414d60b5c307aace975 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom new file mode 100644 index 000000000..152db2bdc --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom @@ -0,0 +1,6 @@ + + 4.0.0 + xalan-bin-dist + xml-apis + 2.7.0 + \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 new file mode 100644 index 000000000..b4ab1984a --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.md5 @@ -0,0 +1 @@ +397393d2fed99f21295f9765db4daa39 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 new file mode 100644 index 000000000..af96bd0f0 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/2.7.0/xml-apis-2.7.0.pom.sha1 @@ -0,0 +1 @@ +e05fa7c530c0d57a6727153144b099f9ac7bd3bf \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml new file mode 100644 index 000000000..97cbc7798 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml @@ -0,0 +1,11 @@ + + xalan-bin-dist + xml-apis + 2.7.0 + + + 2.7.0 + + 20070828112349 + + \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5 b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5 new file mode 100644 index 000000000..59864b4b4 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.md5 @@ -0,0 +1 @@ +3b2a8867dbd3e9474a2ff3fce851d510 \ No newline at end of file diff --git a/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1 b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1 new file mode 100644 index 000000000..6ed6a1d39 --- /dev/null +++ b/repository/xalan-bin-dist/xml-apis/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +12d4a985dee1a1d5e9cbb524c83c2f5f8be5cd81 \ No newline at end of file diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 0ca602f4a..0b47705a2 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -19,7 +19,8 @@ xalan-bin-dist:xalan xerces:xercesImpl - xerces:xmlParserAPIs + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer /endorsed @@ -49,7 +50,8 @@ MOA:moa-common xalan-bin-dist:xalan xerces:xercesImpl - xerces:xmlParserAPIs + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer iaik.prod:iaik_ecc iaik.prod:iaik_jce_full iaik.prod:iaik_Pkcs11Provider @@ -142,85 +144,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/spss/assembly.xml b/spss/assembly.xml index a52860016..435dd04ec 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -19,7 +19,8 @@ xalan-bin-dist:xalan xerces:xercesImpl - xerces:xmlParserAPIs + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer /endorsed @@ -139,85 +140,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 1a169b357..c71b4708d 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -65,8 +65,12 @@ xercesImpl - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis + + + xalan-bin-dist + serializer iaik.prod diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 7fa109145..62b925957 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -101,8 +101,14 @@ provided - xerces - xmlParserAPIs + xalan-bin-dist + xml-apis + + provided + + + xalan-bin-dist + serializer provided -- cgit v1.2.3 From b5acc37cbd4dda5bad97a94b424b7a3dd850c97c Mon Sep 17 00:00:00 2001 From: mcentner Date: Fri, 31 Aug 2007 12:25:16 +0000 Subject: Added shared libraries for IAIK PKCS#11-Wrapper. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@977 d688527b-c9ab-4aba-bd8d-4036d912da1d --- component-pkcs11libs.xml | 39 +++++++++++ id/assembly-auth.xml | 6 +- id/assembly-proxy.xml | 7 +- pom.xml | 75 +++++++++++++++++++++ .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so | Bin 0 -> 113226 bytes .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 | 1 + .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 | 1 + .../1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so | Bin 0 -> 119858 bytes .../iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 | 1 + .../iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 | 1 + .../iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so | Bin 0 -> 151944 bytes .../iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 | 1 + ...iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 | 1 + .../iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so | Bin 0 -> 211040 bytes ...aik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 | 1 + ...ik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 | 1 + .../iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll | Bin 0 -> 67584 bytes .../iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 | 1 + .../iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 | 1 + .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom | 3 +- .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 | 2 +- .../1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 | 2 +- .../prod/iaik_Pkcs11Wrapper/maven-metadata.xml | 2 +- .../prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 | 2 +- .../iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 | 2 +- spss/assembly-lib.xml | 14 ++-- spss/assembly.xml | 14 ++-- 27 files changed, 150 insertions(+), 28 deletions(-) create mode 100644 component-pkcs11libs.xml create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 create mode 100644 repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 (limited to 'id/assembly-proxy.xml') diff --git a/component-pkcs11libs.xml b/component-pkcs11libs.xml new file mode 100644 index 000000000..c967690d5 --- /dev/null +++ b/component-pkcs11libs.xml @@ -0,0 +1,39 @@ + + + + + iaik.prod:iaik_Pkcs11Wrapper:dll:win32 + + /pkcs11/win32 + pkcs11wrapper.${extension} + + + + iaik.prod:iaik_Pkcs11Wrapper:so:linux + + /pkcs11/linux + libpkcs11wrapper.${extension} + + + + iaik.prod:iaik_Pkcs11Wrapper:so:solaris_sparc + + /pkcs11/solaris_sparc + libpkcs11wrapper.${extension} + + + + iaik.prod:iaik_Pkcs11Wrapper:so:solaris_sparcv9 + + /pkcs11/solaris_sparcv9 + libpkcs11wrapper.${extension} + + + + iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm + + /pkcs11/wince30arm + pkcs11wrapper.${extension} + + + \ No newline at end of file diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index c92e30179..6a9005b5d 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -74,7 +74,7 @@ iaik.prod:iaik_ecc iaik.prod:iaik_jce_full iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper + iaik.prod:iaik_Pkcs11Wrapper:jar /ext ${artifactId}.${extension} @@ -107,5 +107,9 @@ + + + component-pkcs11libs.xml + diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 6817b70be..d174cc52c 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -60,7 +60,7 @@ iaik.prod:iaik_ecc iaik.prod:iaik_jce_full iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper + iaik.prod:iaik_Pkcs11Wrapper:jar /ext ${artifactId}.${extension} @@ -93,6 +93,9 @@ - + + + component-pkcs11libs.xml + diff --git a/pom.xml b/pom.xml index bbaa2a82b..31871021b 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,46 @@ dll runtime + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + linux + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + linux_x64 + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + solaris_sparc + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + solaris_sparcv9 + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + 1.2.16 + wince30arm + dll + runtime + xerces xercesImpl @@ -301,6 +341,41 @@ dll runtime + + iaik.prod + iaik_Pkcs11Wrapper + linux + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + linux_x64 + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + solaris_sparc + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + solaris_sparcv9 + so + runtime + + + iaik.prod + iaik_Pkcs11Wrapper + wince30arm + dll + runtime + diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so new file mode 100644 index 000000000..11852511b Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so differ diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 new file mode 100644 index 000000000..c1a9134e5 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 @@ -0,0 +1 @@ +3847181418fd479473b3b60d0d384b78 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 new file mode 100644 index 000000000..09664aadf --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 @@ -0,0 +1 @@ +ff80de20def956f474cd36f351c1ac99cb76bf40 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so new file mode 100644 index 000000000..393946053 Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so differ diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 new file mode 100644 index 000000000..ccb273d54 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 @@ -0,0 +1 @@ +e95dfd3b6b4f616daa12f4440da49cac \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 new file mode 100644 index 000000000..f0351a6a3 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 @@ -0,0 +1 @@ +a686948d388d5f9d4e11c932ce545b800c847f17 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so new file mode 100644 index 000000000..0b19f10c1 Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so differ diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 new file mode 100644 index 000000000..67e896572 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 @@ -0,0 +1 @@ +01003bd2e025deb2f981ef9ba5a61756 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 new file mode 100644 index 000000000..c13562e72 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 @@ -0,0 +1 @@ +313975b7ce5368703fa6d4684c1582c936e2c003 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so new file mode 100644 index 000000000..11f928b0b Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so differ diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 new file mode 100644 index 000000000..392e5cce2 --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 @@ -0,0 +1 @@ +0e4b9707f80757f99856755872659f70 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 new file mode 100644 index 000000000..f2ce9fc3b --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 @@ -0,0 +1 @@ +dcb89a48fb8e93d79e2b3bc490d4cb17c4d02ea3 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll new file mode 100644 index 000000000..d98e48d80 Binary files /dev/null and b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll differ diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 new file mode 100644 index 000000000..4cab4126b --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 @@ -0,0 +1 @@ +be0698efa409d94f0f009c3c5179a0a4 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 new file mode 100644 index 000000000..7b6c4a70a --- /dev/null +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 @@ -0,0 +1 @@ +b3bd0928d60b99df30356268295d94910dd7b08a \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom index c35dc3ff4..0fd16012a 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom @@ -2,7 +2,6 @@ 4.0.0 iaik.prod iaik_Pkcs11Wrapper - dll + jar 1.2.16 - POM was created from install:install-file \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 index a0aecbbdd..e9a0270f8 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 @@ -1 +1 @@ -cfc860671159b339ec43c9582a9f50e4 \ No newline at end of file +3903f2c2ec48e9f770b51e6eb3a460db \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 index a588353d1..08f2e3b85 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 @@ -1 +1 @@ -3eafa5eae317b8f7160560e7b089285fc95fe636 \ No newline at end of file +90a1995356174c420a7da5afea2659b3f12276b0 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml index 1a1b65b5f..0224c7a9f 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml @@ -8,6 +8,6 @@ 1.2.16 - 20070814085134 + 20070831113210 \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 index a1f79b0ce..77ac4cafe 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 @@ -1 +1 @@ -c38b8b9714dd794e9d4fe257b44f51fe \ No newline at end of file +1b9037605610bc8bb690baaf52aa938d \ No newline at end of file diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 index d8736b3a3..0b423356d 100644 --- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 +++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 @@ -1 +1 @@ -6142fc6556cf0b3b8cc4a850acf070df950242e7 \ No newline at end of file +efa7f6d652e232fa94988009d645445393f3904c \ No newline at end of file diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 0b47705a2..1ed2ce58e 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -31,7 +31,7 @@ iaik.prod:iaik_ecc iaik.prod:iaik_jce_full iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper + iaik.prod:iaik_Pkcs11Wrapper:jar /ext @@ -59,13 +59,6 @@ /lib - - - iaik.prod:iaik_Pkcs11Wrapper:dll:win32 - - /lib/win32 - pkcs11wrapper.${extension} - moa-spss.${extension} false @@ -108,6 +101,11 @@ + + component-pkcs11libs.xml + + + ${basedir}/spss/handbook/handbook.html diff --git a/spss/assembly.xml b/spss/assembly.xml index 48ee536b2..e7c9e86cc 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -31,7 +31,7 @@ iaik.prod:iaik_ecc iaik.prod:iaik_jce_full iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper + iaik.prod:iaik_Pkcs11Wrapper:jar /ext @@ -79,15 +79,9 @@ - - - - iaik.prod:iaik_Pkcs11Wrapper:dll:win32 - - /pkcs11/win32 - pkcs11wrapper.${extension} - - + + component-pkcs11libs.xml + -- cgit v1.2.3 From 31d5acacc9c22f45251827b38ad689cdeb705efc Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 Sep 2007 07:07:10 +0000 Subject: Changed finalName of the different assemblies. git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@989 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 4 ++-- id/assembly-proxy.xml | 4 ++-- pom.xml | 3 ++- spss/assembly-lib.xml | 3 ++- spss/assembly.xml | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 6a9005b5d..539541e3a 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -1,9 +1,9 @@ - ID-auth + id-auth-${project.version} zip - + tar.gz moa-id-auth-${project.version} diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index d174cc52c..bfee340ad 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -1,9 +1,9 @@ - ID-proxy + id-proxy-${project.version} zip - + tar.gz moa-id-proxy-${project.version} diff --git a/pom.xml b/pom.xml index 67bc316a4..82ac9d91e 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,8 @@ false maven-assembly-plugin 2.2-beta-1 - + + moa id/assembly-auth.xml id/assembly-proxy.xml diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 1ed2ce58e..560b2be75 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -1,8 +1,9 @@ - SPSS-lib + spss-${project.version}-lib zip + tar.gz moa-spss-lib-${project.version} diff --git a/spss/assembly.xml b/spss/assembly.xml index e7c9e86cc..780e8c346 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -1,8 +1,9 @@ - SPSS + spss-${project.version} zip + tar.gz moa-spss-${project.version} -- cgit v1.2.3 From 072f482d381f6cc00c336e3f633c975eae3aef37 Mon Sep 17 00:00:00 2001 From: pdanner Date: Tue, 11 Sep 2007 10:24:18 +0000 Subject: fixed build process for spss tools git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1004 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 217 +++++++++++----------- id/assembly-proxy.xml | 189 +++++++++---------- spss/assembly-lib.xml | 78 ++++---- spss/assembly.xml | 33 ++-- spss/server/serverlib/pom.xml | 1 + spss/server/tools/pom.xml | 11 ++ spss/server/tools/run/certtool.bat | 25 --- spss/server/tools/run/certtool.sh | 20 -- spss/server/tools/run/configtool.bat | 25 --- spss/server/tools/run/configtool.sh | 20 -- spss/server/tools/src/main/scripts/certtool.bat | 25 +++ spss/server/tools/src/main/scripts/certtool.sh | 20 ++ spss/server/tools/src/main/scripts/configtool.bat | 25 +++ spss/server/tools/src/main/scripts/configtool.sh | 20 ++ 14 files changed, 364 insertions(+), 345 deletions(-) delete mode 100644 spss/server/tools/run/certtool.bat delete mode 100644 spss/server/tools/run/certtool.sh delete mode 100644 spss/server/tools/run/configtool.bat delete mode 100644 spss/server/tools/run/configtool.sh create mode 100644 spss/server/tools/src/main/scripts/certtool.bat create mode 100644 spss/server/tools/src/main/scripts/certtool.sh create mode 100644 spss/server/tools/src/main/scripts/configtool.bat create mode 100644 spss/server/tools/src/main/scripts/configtool.sh (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index 539541e3a..e3cd12bfd 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -1,115 +1,116 @@ - id-auth-${project.version} - - - zip - tar.gz - + id-auth-${project.version} + + + dir + zip + tar.gz + moa-id-auth-${project.version} - - - ${basedir}/id/server/data/deploy - / - - **/conf/moa-id/oa/** - **/conf/Catalina/** - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-id/certs/certstore - - **/* - - - - ${basedir}/spss/handbook/conf/moa-spss/certstore - /conf/moa-spss/certstore - - **/* - - - - ${basedir}/id/server/doc - /doc - - - ${basedir}/id - / - - history.txt - readme_${project.version}.txt - - - - ${basedir}/licenses - / - - + + + ${basedir}/id/server/data/deploy + / + + **/conf/moa-id/oa/** + **/conf/Catalina/** + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-id/certs/certstore + + **/* + + + + ${basedir}/spss/handbook/conf/moa-spss/certstore + /conf/moa-spss/certstore + + **/* + + + + ${basedir}/id/server/doc + /doc + + + ${basedir}/id + / + + history.txt + readme_${project.version}.txt + + + + ${basedir}/licenses + / + + + + + + + MOA.id.server:moa-id-auth + + + false + / + ${artifactId}.${extension} + + + + xalan-bin-dist:xalan + xerces:xercesImpl + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer + + /endorsed + ${artifactId}.${extension} + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper:jar + + /ext + ${artifactId}.${extension} + + + false + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc/moa_id + true + + + + + MOA.id:moa-id-templates + + + false + moaid-templates.war + /templates + false + + + - - - - MOA.id.server:moa-id-auth - - - false - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc/moa_id - true - - - - - MOA.id:moa-id-templates - - - false - moaid-templates.war - /templates - false - - - - - - component-pkcs11libs.xml - + + component-pkcs11libs.xml + diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index bfee340ad..a76f8a168 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -1,101 +1,102 @@ - id-proxy-${project.version} - - - zip - tar.gz - + id-proxy-${project.version} + + + dir + zip + tar.gz + moa-id-proxy-${project.version} - - - ${basedir}/id/server/data/deploy - / - - **/conf/moa-spss/** - **/conf/moa-id/transforms/** - - - - ${basedir}/id/server/doc - /doc - - - ${basedir}/id - / - - history.txt - readme_${project.version}.txt - - - - ${basedir}/licenses - / - - + + + ${basedir}/id/server/data/deploy + / + + **/conf/moa-spss/** + **/conf/moa-id/transforms/** + + + + ${basedir}/id/server/doc + /doc + + + ${basedir}/id + / + + history.txt + readme_${project.version}.txt + + + + ${basedir}/licenses + / + + - - - - MOA.id.server:moa-id-proxy - - - true - / - ${artifactId}.${extension} - - - - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - - /endorsed - ${artifactId}.${extension} - - - - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper:jar - - /ext - ${artifactId}.${extension} - - - false - - - - - MOA.id.server:moa-id-lib - - - javadoc - false - api-doc - /doc/moa_id - true - - - - - MOA.id:moa-id-templates - - - false - moaid-templates.war - /templates - false - - - - - - component-pkcs11libs.xml - + + + + MOA.id.server:moa-id-proxy + + + true + / + ${artifactId}.${extension} + + + + xalan-bin-dist:xalan + xerces:xercesImpl + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer + + /endorsed + ${artifactId}.${extension} + + + + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper:jar + + /ext + ${artifactId}.${extension} + + + false + + + + + MOA.id.server:moa-id-lib + + + javadoc + false + api-doc + /doc/moa_id + true + + + + + MOA.id:moa-id-templates + + + false + moaid-templates.war + /templates + false + + + + + + component-pkcs11libs.xml + diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml index 158cf53e9..d955523d4 100644 --- a/spss/assembly-lib.xml +++ b/spss/assembly-lib.xml @@ -1,9 +1,10 @@ spss-${project.version}-lib - + + dir zip - tar.gz + tar.gz moa-spss-lib-${project.version} @@ -21,11 +22,11 @@ xalan-bin-dist:xalan xerces:xercesImpl xalan-bin-dist:xml-apis - xalan-bin-dist:serializer + xalan-bin-dist:serializer /endorsed - - ${artifactId}.${extension} + + ${artifactId}.${extension} @@ -35,31 +36,31 @@ iaik.prod:iaik_Pkcs11Wrapper:jar /ext - - ${artifactId}.${extension} + + ${artifactId}.${extension} + + + + MOA:moa-common + + / + + ${artifactId}.${extension} + + + + MOA:moa-common + xalan-bin-dist:xalan + xerces:xercesImpl + xalan-bin-dist:xml-apis + xalan-bin-dist:serializer + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full + iaik.prod:iaik_Pkcs11Provider + iaik.prod:iaik_Pkcs11Wrapper + + /lib - - - MOA:moa-common - - / - - ${artifactId}.${extension} - - - - MOA:moa-common - xalan-bin-dist:xalan - xerces:xercesImpl - xalan-bin-dist:xml-apis - xalan-bin-dist:serializer - iaik.prod:iaik_ecc - iaik.prod:iaik_jce_full - iaik.prod:iaik_Pkcs11Provider - iaik.prod:iaik_Pkcs11Wrapper - - /lib - moa-spss.${extension} false @@ -86,13 +87,15 @@ + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full iaik.prod:iaik_moa log4j:log4j xalan-bin-dist:xalan /tools - - ${artifactId}.${extension} + + ${artifactId}.${extension} /tools @@ -102,18 +105,17 @@ - - component-pkcs11libs.xml - - - + + component-pkcs11libs.xml + + ${basedir}/spss/handbook/handbook.html /doc - + ${basedir}/spss/server @@ -142,7 +144,7 @@ /licenses - ${basedir}/spss/server/tools/run + ${basedir}/spss/server/tools/src/main/scripts /tools diff --git a/spss/assembly.xml b/spss/assembly.xml index 56cfbb95e..c94186249 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -1,9 +1,10 @@ spss-${project.version} - + + dir zip - tar.gz + tar.gz moa-spss-${project.version} @@ -24,8 +25,8 @@ xalan-bin-dist:serializer /endorsed - - ${artifactId}.${extension} + + ${artifactId}.${extension} @@ -35,8 +36,8 @@ iaik.prod:iaik_Pkcs11Wrapper:jar /ext - - ${artifactId}.${extension} + + ${artifactId}.${extension} moa-spss.${extension} @@ -64,13 +65,15 @@ + iaik.prod:iaik_ecc + iaik.prod:iaik_jce_full iaik.prod:iaik_moa log4j:log4j xalan-bin-dist:xalan /tools - - ${artifactId}.${extension} + + ${artifactId}.${extension} /tools @@ -79,18 +82,18 @@ - - - component-pkcs11libs.xml - - + + + component-pkcs11libs.xml + + ${basedir}/spss/handbook/handbook.html /doc - + ${basedir}/spss/server @@ -131,5 +134,5 @@ /tools - + diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index 87e9b5575..5f0a4eeb1 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -126,6 +126,7 @@ MOA.spss.server moa-spss-tools + test diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index 191ba234f..fa0fca6e0 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -27,6 +27,7 @@ iaik.prod iaik_moa + compile iaik.prod @@ -38,6 +39,16 @@ iaik_ecc compile + + log4j + log4j + compile + + + xalan-bin-dist + xalan + compile + diff --git a/spss/server/tools/run/certtool.bat b/spss/server/tools/run/certtool.bat deleted file mode 100644 index ae55bc4a5..000000000 --- a/spss/server/tools/run/certtool.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -rem -rem Script to invoke the CertTool class -rem -rem Author: Patrick Peck -rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $ -rem - - -if %OS%=="Windows_NT" @setlocal - -set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool -set TOOLSPATH=%~p0 -set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j.jar - -if "%JAVA_HOME%"=="" goto noJavaHome -%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end - -:noJavaHome -echo error: JAVA_HOME not defined - -:end -if %OS%=="Windows_NT" @endlocal \ No newline at end of file diff --git a/spss/server/tools/run/certtool.sh b/spss/server/tools/run/certtool.sh deleted file mode 100644 index 721eff4d8..000000000 --- a/spss/server/tools/run/certtool.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# -# Script to invoke the CertTool class -# -# Author:Patrick Peck -# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $ -# - - -if [ -z "$JAVA_HOME" ]; then - echo "error: JAVA_HOME not defined"; - exit; -fi - -CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool -TOOLSPATH=`dirname $PWD/$0` -CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j.jar - -$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $* diff --git a/spss/server/tools/run/configtool.bat b/spss/server/tools/run/configtool.bat deleted file mode 100644 index 868df11f0..000000000 --- a/spss/server/tools/run/configtool.bat +++ /dev/null @@ -1,25 +0,0 @@ -@echo off - -rem -rem Script to invoke the ConfigTool class -rem -rem Author: Gregor Karlinger -rem Version: $Id: $ -rem - - -if %OS%=="Windows_NT" @setlocal - -set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool -set TOOLSPATH=%~p0 -set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar; - -if "%JAVA_HOME%"=="" goto noJavaHome -%JAVA_HOME%\bin\java.exe -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 -goto end - -:noJavaHome -echo error: JAVA_HOME not defined - -:end -if %OS%=="Windows_NT" @endlocal \ No newline at end of file diff --git a/spss/server/tools/run/configtool.sh b/spss/server/tools/run/configtool.sh deleted file mode 100644 index f7f29bae1..000000000 --- a/spss/server/tools/run/configtool.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# -# Script to invoke the ConfigTool class -# -# Author: Gregor Karlinger -# Version: $Id: $ -# - - -if [ -z "$JAVA_HOME" ]; then - echo "error: JAVA_HOME not defined"; - exit; -fi - -CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool -TOOLSPATH=`dirname $PWD/$0` -CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar - -$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $* diff --git a/spss/server/tools/src/main/scripts/certtool.bat b/spss/server/tools/src/main/scripts/certtool.bat new file mode 100644 index 000000000..d463a8d9d --- /dev/null +++ b/spss/server/tools/src/main/scripts/certtool.bat @@ -0,0 +1,25 @@ +@echo off + +rem +rem Script to invoke the CertTool class +rem +rem Author: Patrick Peck +rem Version: $Id: certtool.bat,v 1.6 2003/05/08 11:46:29 peck Exp $ +rem + + +if %OS%=="Windows_NT" @setlocal + +set CERTTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool +set TOOLSPATH=%~p0 +set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%iaik_moa.jar;%TOOLSPATH%iaik_jce_full.jar;%TOOLSPATH%iaik_ecc.jar;%TOOLSPATH%log4j.jar + +if "%JAVA_HOME%"=="" goto noJavaHome +"%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %CERTTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 +goto end + +:noJavaHome +echo error: JAVA_HOME not defined + +:end +if %OS%=="Windows_NT" @endlocal diff --git a/spss/server/tools/src/main/scripts/certtool.sh b/spss/server/tools/src/main/scripts/certtool.sh new file mode 100644 index 000000000..721eff4d8 --- /dev/null +++ b/spss/server/tools/src/main/scripts/certtool.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# +# Script to invoke the CertTool class +# +# Author:Patrick Peck +# Version: $Id: certtool.sh,v 1.9 2003/06/23 16:01:27 peck Exp $ +# + + +if [ -z "$JAVA_HOME" ]; then + echo "error: JAVA_HOME not defined"; + exit; +fi + +CERTOOL=at.gv.egovernment.moa.spss.server.tools.CertTool +TOOLSPATH=`dirname $PWD/$0` +CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/iaik_moa.jar:$TOOLSPATH/iaik_jce_full.jar:$TOOLSPATH/iaik_ecc.jar:$TOOLSPATH/log4j.jar + +$JAVA_HOME/bin/java -classpath $CLASSPATH $CERTOOL $* diff --git a/spss/server/tools/src/main/scripts/configtool.bat b/spss/server/tools/src/main/scripts/configtool.bat new file mode 100644 index 000000000..330a94d83 --- /dev/null +++ b/spss/server/tools/src/main/scripts/configtool.bat @@ -0,0 +1,25 @@ +@echo off + +rem +rem Script to invoke the ConfigTool class +rem +rem Author: Gregor Karlinger +rem Version: $Id: $ +rem + + +if %OS%=="Windows_NT" @setlocal + +set CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool +set TOOLSPATH=%~p0 +set CLASSPATH=%TOOLSPATH%tools.jar;%TOOLSPATH%xalan.jar; + +if "%JAVA_HOME%"=="" goto noJavaHome +"%JAVA_HOME%\bin\java.exe" -classpath %CLASSPATH% %CONFIGTOOL% %1 %2 %3 %4 %5 %6 %7 %8 %9 +goto end + +:noJavaHome +echo error: JAVA_HOME not defined + +:end +if %OS%=="Windows_NT" @endlocal diff --git a/spss/server/tools/src/main/scripts/configtool.sh b/spss/server/tools/src/main/scripts/configtool.sh new file mode 100644 index 000000000..f7f29bae1 --- /dev/null +++ b/spss/server/tools/src/main/scripts/configtool.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# +# Script to invoke the ConfigTool class +# +# Author: Gregor Karlinger +# Version: $Id: $ +# + + +if [ -z "$JAVA_HOME" ]; then + echo "error: JAVA_HOME not defined"; + exit; +fi + +CONFIGTOOL=at.gv.egovernment.moa.spss.server.tools.ConfigTool +TOOLSPATH=`dirname $PWD/$0` +CLASSPATH=$TOOLSPATH/tools.jar:$TOOLSPATH/xalan.jar + +$JAVA_HOME/bin/java -classpath $CLASSPATH $CONFIGTOOL $* -- cgit v1.2.3 From 6444b6fcb355e4f7599a6cd1f5e9e4e79e6927a8 Mon Sep 17 00:00:00 2001 From: pdanner Date: Wed, 21 Nov 2007 10:10:52 +0000 Subject: changed documentation and codings of Umlaute git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1046 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-auth.xml | 2 +- id/assembly-proxy.xml | 2 +- id/server/doc/moa_id/faqs.htm | 180 +++++++++---------- id/server/doc/moa_id/id-admin.htm | 6 +- id/server/doc/moa_id/id-admin_1.htm | 296 ++++++++++++++++---------------- id/server/doc/moa_id/id-admin_2.htm | 286 +++++++++++++++--------------- id/server/doc/moa_id/id-admin_3.htm | 56 +++--- id/server/doc/moa_id/id-anwendung.htm | 30 ++-- id/server/doc/moa_id/id-anwendung_1.htm | 26 +-- id/server/doc/moa_id/id-anwendung_2.htm | 78 ++++----- id/server/doc/moa_id/links.htm | 22 +-- pom.xml | 2 +- 12 files changed, 493 insertions(+), 493 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml index e3cd12bfd..98c02cc1a 100644 --- a/id/assembly-auth.xml +++ b/id/assembly-auth.xml @@ -92,7 +92,7 @@ javadoc false api-doc - /doc/moa_id + /doc true diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index a76f8a168..deed772eb 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -78,7 +78,7 @@ javadoc false api-doc - /doc/moa_id + /doc true diff --git a/id/server/doc/moa_id/faqs.htm b/id/server/doc/moa_id/faqs.htm index effc21637..0b9ef0415 100644 --- a/id/server/doc/moa_id/faqs.htm +++ b/id/server/doc/moa_id/faqs.htm @@ -1,6 +1,6 @@ - FAQs - Häufig gestellte Fragen + FAQs - Häufig gestellte Fragen @@ -22,7 +22,7 @@