diff options
| author | mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-28 13:11:10 +0000 |
|---|---|---|
| committer | mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-08-28 13:11:10 +0000 |
| commit | 8237dd219e82bca7c4196895e0224528ab50b17c (patch) | |
| tree | e00826fba394d5e5b68103e531de9033060402d7 | |
| parent | ac828e173bd2fad020c22cb2446706299c304dac (diff) | |
| download | moa-id-spss-8237dd219e82bca7c4196895e0224528ab50b17c.tar.gz moa-id-spss-8237dd219e82bca7c4196895e0224528ab50b17c.tar.bz2 moa-id-spss-8237dd219e82bca7c4196895e0224528ab50b17c.zip | |
Fixed inclusion of the iaik_Pkcs11Wrapper dll in the MOA-SPSS assembly.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@971 d688527b-c9ab-4aba-bd8d-4036d912da1d
| -rw-r--r-- | pom.xml | 10 | ||||
| -rw-r--r-- | spss/assembly.xml | 27 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 8 |
3 files changed, 28 insertions, 17 deletions
@@ -292,6 +292,16 @@ </dependency> </dependencies>
</dependencyManagement>
+ + <dependencies> + <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <classifier>win32</classifier> + <type>dll</type> + <scope>runtime</scope> + </dependency> + </dependencies> <repositories>
<repository>
diff --git a/spss/assembly.xml b/spss/assembly.xml index 435dd04ec..48ee536b2 100644 --- a/spss/assembly.xml +++ b/spss/assembly.xml @@ -42,23 +42,6 @@ <unpack>false</unpack> </binaries> </moduleSet> - <moduleSet> - <includes> - <include>MOA.spss.server:moa-spss-lib</include> - </includes> - <binaries> - <includeDependencies>true</includeDependencies> - <dependencySets> - <dependencySet> - <includes> - <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> - </includes> - <outputDirectory>/pkcs11/win32</outputDirectory> - <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> - </dependencySet> - </dependencySets> - </binaries> - </moduleSet> <moduleSet> <includes> <include>MOA.spss.server:moa-spss-lib</include> @@ -96,6 +79,16 @@ </moduleSet> </moduleSets> + <dependencySets> + <dependencySet> + <includes> + <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include> + </includes> + <outputDirectory>/pkcs11/win32</outputDirectory> + <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> + <files> <file> <source>${basedir}/spss/handbook/handbook.html</source> diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 62b925957..f1503ba82 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -89,6 +89,14 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>iaik.prod</groupId> + <artifactId>iaik_Pkcs11Wrapper</artifactId> + <classifier>win32</classifier> + <type>dll</type> + <!-- should be in the ext directory of the jre --> + <scope>provided</scope> + </dependency> + <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> <!-- should be provided by the container or jre --> |