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