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(-) 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