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-proxy.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'id/assembly-proxy.xml') 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 -- 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 --- id/assembly-proxy.xml | 124 +++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'id/assembly-proxy.xml') 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 + + + + + + -- 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-proxy.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') 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 -- 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-proxy.xml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'id/assembly-proxy.xml') 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 + / + -- 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 --- id/assembly-proxy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') 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 -- 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 --- id/assembly-proxy.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') 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} -- 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 --- id/assembly-proxy.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'id/assembly-proxy.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 + -- 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-proxy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id/assembly-proxy.xml') 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} -- 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-proxy.xml | 189 +++++++++++++++++++++++++------------------------- 1 file changed, 95 insertions(+), 94 deletions(-) (limited to 'id/assembly-proxy.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 + -- 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-proxy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') 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 -- cgit v1.2.3 From 527f2ec316c6d67498ed6dfe37a95218a2ab6f54 Mon Sep 17 00:00:00 2001 From: spuchmann Date: Mon, 15 Sep 2008 07:33:53 +0000 Subject: raised version to 1.4.4 moved licenses to root folder fixed Bug 332 and 333 slVersion changed from 1.1 to 1.2 (MOA-ID-Configuration-1.4.4.xsd) git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1091 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-proxy.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index deed772eb..0f7af5491 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -31,8 +31,13 @@ - ${basedir}/licenses + ${basedir} / + + LICENSE-2.0.txt + NOTICE.txt + IAIK-LICENSE.txt + @@ -70,6 +75,17 @@ false + + + MOA:moa-id-oa + + + true + / + oa.${extension} + false + + MOA.id.server:moa-id-lib -- cgit v1.2.3 From 9bbe4aa713e2c38dcfba02880c9b2cb63e82a859 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Tue, 21 Jun 2011 15:40:44 +0000 Subject: =?UTF-8?q?*=20Update=20MOA-ID=20(Template=20Mechanismus=20f=C3=BC?= =?UTF-8?q?r=20Online-Vollmachten=20inkl.=20MOA-ID=20Config)=20*=20Update?= =?UTF-8?q?=20BK-Auswahl=20Howto=20*=20Update=20Default-Konfigurationen=20?= =?UTF-8?q?*=20L=C3=B6schen=20von=20A1-Signatur=20Texten=20*=20Entfernung?= =?UTF-8?q?=20von=20tempates.war?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1206 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-proxy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 0f7af5491..4e22222e5 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -98,7 +98,7 @@ true - + -- cgit v1.2.3 From abe2192ea697ccc133f1fededa3a8ee1528ec7c8 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Mon, 27 Jun 2011 11:37:28 +0000 Subject: Update readmes, Template zur BK-Auswahl (neue Bilder), Vollmachten-Template git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1210 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-proxy.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index 4e22222e5..c55d3dbfd 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -37,6 +37,7 @@ LICENSE-2.0.txt NOTICE.txt IAIK-LICENSE.txt + EUPL v.1.1 - Licence.pdf -- cgit v1.2.3 From 201c455bcd89810c8648d62f5086ebe5bd49d273 Mon Sep 17 00:00:00 2001 From: kstranacher Date: Fri, 21 Oct 2011 12:43:07 +0000 Subject: =?UTF-8?q?*=20Update=20assembly-files=20(fehlende=20SIC=5FLICENSE?= =?UTF-8?q?.txt=20hinzugef=C3=BCgt)=20*=20iajk=5Fmoa-1.31=20aus=201.29=20V?= =?UTF-8?q?erzeichnis=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1227 d688527b-c9ab-4aba-bd8d-4036d912da1d --- id/assembly-proxy.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'id/assembly-proxy.xml') diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml index c55d3dbfd..bf8fa1140 100644 --- a/id/assembly-proxy.xml +++ b/id/assembly-proxy.xml @@ -37,7 +37,8 @@ LICENSE-2.0.txt NOTICE.txt IAIK-LICENSE.txt - EUPL v.1.1 - Licence.pdf + EUPL v.1.1 - Licence.pdf + SIC_LICENSE.txt -- cgit v1.2.3