diff options
| -rw-r--r-- | id/assembly-auth.xml | 217 | ||||
| -rw-r--r-- | id/assembly-proxy.xml | 189 | ||||
| -rw-r--r-- | spss/assembly-lib.xml | 78 | ||||
| -rw-r--r-- | spss/assembly.xml | 33 | ||||
| -rw-r--r-- | spss/server/serverlib/pom.xml | 1 | ||||
| -rw-r--r-- | spss/server/tools/pom.xml | 11 | ||||
| -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 |
10 files changed, 278 insertions, 259 deletions
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 @@ <assembly>
- <id>id-auth-${project.version}</id>
-
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
+ <id>id-auth-${project.version}</id>
+
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
<baseDirectory>moa-id-auth-${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/id/server/data/deploy</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/conf/moa-id/oa/**</exclude>
- <exclude>**/conf/Catalina/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
- <outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
- <outputDirectory>/conf/moa-spss/certstore</outputDirectory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/id/server/doc</directory>
- <outputDirectory>/doc</outputDirectory>
- </fileSet>
- <fileSet> - <directory>${basedir}/id</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>history.txt</include> - <include>readme_${project.version}.txt</include> - </includes> - </fileSet> - <fileSet>
- <directory>${basedir}/licenses</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/id/server/data/deploy</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/conf/moa-id/oa/**</exclude>
+ <exclude>**/conf/Catalina/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+ <outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+ <outputDirectory>/conf/moa-spss/certstore</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/id/server/doc</directory>
+ <outputDirectory>/doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/id</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>history.txt</include>
+ <include>readme_${project.version}.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/licenses</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-auth</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>xalan-bin-dist:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xalan-bin-dist:xml-apis</include>
+ <include>xalan-bin-dist:serializer</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-lib</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>api-doc</outputFileNameMapping>
+ <outputDirectory>/doc/moa_id</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id:moa-id-templates</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+ <outputDirectory>/templates</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>MOA.id.server:moa-id-auth</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <outputDirectory>/</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>xalan-bin-dist:xalan</include>
- <include>xerces:xercesImpl</include>
- <include>xalan-bin-dist:xml-apis</include> - <include>xalan-bin-dist:serializer</include>
- </includes>
- <outputDirectory>/endorsed</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - </dependencySet>
- <dependencySet>
- <includes>
- <include>iaik.prod:iaik_ecc</include>
- <include>iaik.prod:iaik_jce_full</include>
- <include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
- </includes>
- <outputDirectory>/ext</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - </dependencySet>
- </dependencySets>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>MOA.id.server:moa-id-lib</include>
- </includes>
- <binaries>
- <attachmentClassifier>javadoc</attachmentClassifier>
- <includeDependencies>false</includeDependencies>
- <outputFileNameMapping>api-doc</outputFileNameMapping>
- <outputDirectory>/doc/moa_id</outputDirectory>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>MOA.id:moa-id-templates</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
- <outputDirectory>/templates</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
- - <componentDescriptors> - <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> - </componentDescriptors> + <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
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 @@ <assembly>
- <id>id-proxy-${project.version}</id>
-
- <formats>
- <format>zip</format>
- <format>tar.gz</format>
- </formats>
+ <id>id-proxy-${project.version}</id>
+
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
<baseDirectory>moa-id-proxy-${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>${basedir}/id/server/data/deploy</directory>
- <outputDirectory>/</outputDirectory>
- <excludes>
- <exclude>**/conf/moa-spss/**</exclude>
- <exclude>**/conf/moa-id/transforms/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/id/server/doc</directory>
- <outputDirectory>/doc</outputDirectory>
- </fileSet>
- <fileSet> - <directory>${basedir}/id</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>history.txt</include> - <include>readme_${project.version}.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>${basedir}/licenses</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - </fileSets>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/id/server/data/deploy</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>**/conf/moa-spss/**</exclude>
+ <exclude>**/conf/moa-id/transforms/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/id/server/doc</directory>
+ <outputDirectory>/doc</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/id</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>history.txt</include>
+ <include>readme_${project.version}.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/licenses</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>MOA.id.server:moa-id-proxy</include>
- </includes>
- <binaries>
- <includeDependencies>true</includeDependencies>
- <outputDirectory>/</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>xalan-bin-dist:xalan</include>
- <include>xerces:xercesImpl</include>
- <include>xalan-bin-dist:xml-apis</include> - <include>xalan-bin-dist:serializer</include>
- </includes>
- <outputDirectory>/endorsed</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - </dependencySet>
- <dependencySet>
- <includes>
- <include>iaik.prod:iaik_ecc</include>
- <include>iaik.prod:iaik_jce_full</include>
- <include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
- </includes>
- <outputDirectory>/ext</outputDirectory>
- <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - </dependencySet>
- </dependencySets>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>MOA.id.server:moa-id-lib</include>
- </includes>
- <binaries>
- <attachmentClassifier>javadoc</attachmentClassifier>
- <includeDependencies>false</includeDependencies>
- <outputFileNameMapping>api-doc</outputFileNameMapping>
- <outputDirectory>/doc/moa_id</outputDirectory>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>MOA.id:moa-id-templates</include>
- </includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
- <outputDirectory>/templates</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
- - <componentDescriptors> - <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> - </componentDescriptors> + <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-proxy</include>
+ </includes>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <outputDirectory>/</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>xalan-bin-dist:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xalan-bin-dist:xml-apis</include>
+ <include>xalan-bin-dist:serializer</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id.server:moa-id-lib</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>api-doc</outputFileNameMapping>
+ <outputDirectory>/doc/moa_id</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.id:moa-id-templates</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
+ <outputDirectory>/templates</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
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 @@ <assembly> <id>spss-${project.version}-lib</id> - + <formats> + <format>dir</format> <format>zip</format> - <format>tar.gz</format> + <format>tar.gz</format> </formats> <baseDirectory>moa-spss-lib-${project.version}</baseDirectory> @@ -21,11 +22,11 @@ <include>xalan-bin-dist:xalan</include> <include>xerces:xercesImpl</include> <include>xalan-bin-dist:xml-apis</include> - <include>xalan-bin-dist:serializer</include> + <include>xalan-bin-dist:serializer</include> </includes> <outputDirectory>/endorsed</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> <dependencySet> <includes> @@ -35,31 +36,31 @@ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include> </includes> <outputDirectory>/ext</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + </dependencySet> + <dependencySet> + <includes> + <include>MOA:moa-common</include> + </includes> + <outputDirectory>/</outputDirectory> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + </dependencySet> + <dependencySet> + <excludes> + <exclude>MOA:moa-common</exclude> + <exclude>xalan-bin-dist:xalan</exclude> + <exclude>xerces:xercesImpl</exclude> + <exclude>xalan-bin-dist:xml-apis</exclude> + <exclude>xalan-bin-dist:serializer</exclude> + <exclude>iaik.prod:iaik_ecc</exclude> + <exclude>iaik.prod:iaik_jce_full</exclude> + <exclude>iaik.prod:iaik_Pkcs11Provider</exclude> + <exclude>iaik.prod:iaik_Pkcs11Wrapper</exclude> + </excludes> + <outputDirectory>/lib</outputDirectory> </dependencySet> - <dependencySet> - <includes> - <include>MOA:moa-common</include> - </includes> - <outputDirectory>/</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - </dependencySet> - <dependencySet> - <excludes> - <exclude>MOA:moa-common</exclude> - <exclude>xalan-bin-dist:xalan</exclude> - <exclude>xerces:xercesImpl</exclude> - <exclude>xalan-bin-dist:xml-apis</exclude> - <exclude>xalan-bin-dist:serializer</exclude> - <exclude>iaik.prod:iaik_ecc</exclude> - <exclude>iaik.prod:iaik_jce_full</exclude> - <exclude>iaik.prod:iaik_Pkcs11Provider</exclude> - <exclude>iaik.prod:iaik_Pkcs11Wrapper</exclude> - </excludes> - <outputDirectory>/lib</outputDirectory> - </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> <unpack>false</unpack> @@ -86,13 +87,15 @@ <dependencySets> <dependencySet> <includes> + <include>iaik.prod:iaik_ecc</include> + <include>iaik.prod:iaik_jce_full</include> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> </dependencySets> <outputDirectory>/tools</outputDirectory> @@ -102,18 +105,17 @@ </moduleSet> </moduleSets> - <componentDescriptors> - <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> - </componentDescriptors> - - + <componentDescriptors> + <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> + </componentDescriptors> + <files> <file> <source>${basedir}/spss/handbook/handbook.html</source> <outputDirectory>/doc</outputDirectory> </file> </files> - + <fileSets> <fileSet> <directory>${basedir}/spss/server</directory> @@ -142,7 +144,7 @@ <outputDirectory>/licenses</outputDirectory> </fileSet> <fileSet> - <directory>${basedir}/spss/server/tools/run</directory> + <directory>${basedir}/spss/server/tools/src/main/scripts</directory> <outputDirectory>/tools</outputDirectory> </fileSet> </fileSets> 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 @@ <assembly> <id>spss-${project.version}</id> - + <formats> + <format>dir</format> <format>zip</format> - <format>tar.gz</format> + <format>tar.gz</format> </formats> <baseDirectory>moa-spss-${project.version}</baseDirectory> @@ -24,8 +25,8 @@ <include>xalan-bin-dist:serializer</include> </includes> <outputDirectory>/endorsed</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> <dependencySet> <includes> @@ -35,8 +36,8 @@ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include> </includes> <outputDirectory>/ext</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> </dependencySets> <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping> @@ -64,13 +65,15 @@ <dependencySets> <dependencySet> <includes> + <include>iaik.prod:iaik_ecc</include> + <include>iaik.prod:iaik_jce_full</include> <include>iaik.prod:iaik_moa</include> <include>log4j:log4j</include> <include>xalan-bin-dist:xalan</include> </includes> <outputDirectory>/tools</outputDirectory> - <!-- strip version off the artifact file names --> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <!-- strip version off the artifact file names --> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> </dependencySet> </dependencySets> <outputDirectory>/tools</outputDirectory> @@ -79,18 +82,18 @@ </binaries> </moduleSet> </moduleSets> - - <componentDescriptors> - <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> - </componentDescriptors> - + + <componentDescriptors> + <componentDescriptor>component-pkcs11libs.xml</componentDescriptor> + </componentDescriptors> + <files> <file> <source>${basedir}/spss/handbook/handbook.html</source> <outputDirectory>/doc</outputDirectory> </file> </files> - + <fileSets> <fileSet> <directory>${basedir}/spss/server</directory> @@ -131,5 +134,5 @@ <outputDirectory>/tools</outputDirectory> </fileSet> </fileSets> - + </assembly> 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 |