aboutsummaryrefslogtreecommitdiff
path: root/spss/server
diff options
context:
space:
mode:
authorpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-09-11 10:24:18 +0000
committerpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-09-11 10:24:18 +0000
commit072f482d381f6cc00c336e3f633c975eae3aef37 (patch)
treeeec19a9a3b3f2c901c99af5ff5b409a092ed9657 /spss/server
parentb33fd8084f4ea1562c9056422ebc111b4a92f2a6 (diff)
downloadmoa-id-spss-072f482d381f6cc00c336e3f633c975eae3aef37.tar.gz
moa-id-spss-072f482d381f6cc00c336e3f633c975eae3aef37.tar.bz2
moa-id-spss-072f482d381f6cc00c336e3f633c975eae3aef37.zip
fixed build process for spss tools
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1004 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'spss/server')
-rw-r--r--spss/server/serverlib/pom.xml1
-rw-r--r--spss/server/tools/pom.xml11
-rw-r--r--spss/server/tools/src/main/scripts/certtool.bat (renamed from spss/server/tools/run/certtool.bat)4
-rw-r--r--spss/server/tools/src/main/scripts/certtool.sh (renamed from spss/server/tools/run/certtool.sh)0
-rw-r--r--spss/server/tools/src/main/scripts/configtool.bat (renamed from spss/server/tools/run/configtool.bat)4
-rw-r--r--spss/server/tools/src/main/scripts/configtool.sh (renamed from spss/server/tools/run/configtool.sh)0
6 files changed, 16 insertions, 4 deletions
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 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-tools</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
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 @@
<dependency>
<groupId>iaik.prod</groupId>
<artifactId>iaik_moa</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>iaik.prod</groupId>
@@ -38,6 +39,16 @@
<artifactId>iaik_ecc</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan-bin-dist</groupId>
+ <artifactId>xalan</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/spss/server/tools/run/certtool.bat b/spss/server/tools/src/main/scripts/certtool.bat
index ae55bc4a5..d463a8d9d 100644
--- a/spss/server/tools/run/certtool.bat
+++ b/spss/server/tools/src/main/scripts/certtool.bat
@@ -15,11 +15,11 @@ 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
+"%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
+if %OS%=="Windows_NT" @endlocal
diff --git a/spss/server/tools/run/certtool.sh b/spss/server/tools/src/main/scripts/certtool.sh
index 721eff4d8..721eff4d8 100644
--- a/spss/server/tools/run/certtool.sh
+++ b/spss/server/tools/src/main/scripts/certtool.sh
diff --git a/spss/server/tools/run/configtool.bat b/spss/server/tools/src/main/scripts/configtool.bat
index 868df11f0..330a94d83 100644
--- a/spss/server/tools/run/configtool.bat
+++ b/spss/server/tools/src/main/scripts/configtool.bat
@@ -15,11 +15,11 @@ 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
+"%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
+if %OS%=="Windows_NT" @endlocal
diff --git a/spss/server/tools/run/configtool.sh b/spss/server/tools/src/main/scripts/configtool.sh
index f7f29bae1..f7f29bae1 100644
--- a/spss/server/tools/run/configtool.sh
+++ b/spss/server/tools/src/main/scripts/configtool.sh