aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-08-31 12:25:16 +0000
committermcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-08-31 12:25:16 +0000
commitb5acc37cbd4dda5bad97a94b424b7a3dd850c97c (patch)
treef17f48389a13d47687eb81f090d9daeaac5e2335
parenta8cf63a43ddb0589bfaf8a9e347365f6dbbdbe35 (diff)
downloadmoa-id-spss-b5acc37cbd4dda5bad97a94b424b7a3dd850c97c.tar.gz
moa-id-spss-b5acc37cbd4dda5bad97a94b424b7a3dd850c97c.tar.bz2
moa-id-spss-b5acc37cbd4dda5bad97a94b424b7a3dd850c97c.zip
Added shared libraries for IAIK PKCS#11-Wrapper.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@977 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--component-pkcs11libs.xml39
-rw-r--r--id/assembly-auth.xml6
-rw-r--r--id/assembly-proxy.xml7
-rw-r--r--pom.xml75
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.sobin0 -> 113226 bytes
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md51
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha11
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.sobin0 -> 119858 bytes
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md51
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha11
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.sobin0 -> 151944 bytes
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md51
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha11
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.sobin0 -> 211040 bytes
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md51
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha11
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dllbin0 -> 67584 bytes
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md51
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha11
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom3
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md52
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha12
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml2
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md52
-rw-r--r--repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha12
-rw-r--r--spss/assembly-lib.xml14
-rw-r--r--spss/assembly.xml14
27 files changed, 150 insertions, 28 deletions
diff --git a/component-pkcs11libs.xml b/component-pkcs11libs.xml
new file mode 100644
index 000000000..c967690d5
--- /dev/null
+++ b/component-pkcs11libs.xml
@@ -0,0 +1,39 @@
+<component>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
+ </includes>
+ <outputDirectory>/pkcs11/win32</outputDirectory>
+ <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:so:linux</include>
+ </includes>
+ <outputDirectory>/pkcs11/linux</outputDirectory>
+ <outputFileNameMapping>libpkcs11wrapper.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:so:solaris_sparc</include>
+ </includes>
+ <outputDirectory>/pkcs11/solaris_sparc</outputDirectory>
+ <outputFileNameMapping>libpkcs11wrapper.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:so:solaris_sparcv9</include>
+ </includes>
+ <outputDirectory>/pkcs11/solaris_sparcv9</outputDirectory>
+ <outputFileNameMapping>libpkcs11wrapper.${extension}</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:wince30arm</include>
+ </includes>
+ <outputDirectory>/pkcs11/wince30arm</outputDirectory>
+ <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+</component> \ No newline at end of file
diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index c92e30179..6a9005b5d 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -74,7 +74,7 @@
<include>iaik.prod:iaik_ecc</include>
<include>iaik.prod:iaik_jce_full</include>
<include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
</includes>
<outputDirectory>/ext</outputDirectory>
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
@@ -107,5 +107,9 @@
</binaries>
</moduleSet>
</moduleSets>
+
+ <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index 6817b70be..d174cc52c 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -60,7 +60,7 @@
<include>iaik.prod:iaik_ecc</include>
<include>iaik.prod:iaik_jce_full</include>
<include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
</includes>
<outputDirectory>/ext</outputDirectory>
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
@@ -93,6 +93,9 @@
</binaries>
</moduleSet>
</moduleSets>
-
+
+ <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
diff --git a/pom.xml b/pom.xml
index bbaa2a82b..31871021b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,46 @@
<type>dll</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <version>1.2.16</version>
+ <classifier>linux</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <version>1.2.16</version>
+ <classifier>linux_x64</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <version>1.2.16</version>
+ <classifier>solaris_sparc</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <version>1.2.16</version>
+ <classifier>solaris_sparcv9</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <version>1.2.16</version>
+ <classifier>wince30arm</classifier>
+ <type>dll</type>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -301,6 +341,41 @@
<type>dll</type>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>linux</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>linux_x64</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>solaris_sparc</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>solaris_sparcv9</classifier>
+ <type>so</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>wince30arm</classifier>
+ <type>dll</type>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<repositories>
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so
new file mode 100644
index 000000000..11852511b
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so
Binary files differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5
new file mode 100644
index 000000000..c1a9134e5
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.md5
@@ -0,0 +1 @@
+3847181418fd479473b3b60d0d384b78 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1
new file mode 100644
index 000000000..09664aadf
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux.so.sha1
@@ -0,0 +1 @@
+ff80de20def956f474cd36f351c1ac99cb76bf40 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so
new file mode 100644
index 000000000..393946053
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so
Binary files differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5
new file mode 100644
index 000000000..ccb273d54
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.md5
@@ -0,0 +1 @@
+e95dfd3b6b4f616daa12f4440da49cac \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1
new file mode 100644
index 000000000..f0351a6a3
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-linux_x64.so.sha1
@@ -0,0 +1 @@
+a686948d388d5f9d4e11c932ce545b800c847f17 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so
new file mode 100644
index 000000000..0b19f10c1
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so
Binary files differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5
new file mode 100644
index 000000000..67e896572
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.md5
@@ -0,0 +1 @@
+01003bd2e025deb2f981ef9ba5a61756 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1
new file mode 100644
index 000000000..c13562e72
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparc.so.sha1
@@ -0,0 +1 @@
+313975b7ce5368703fa6d4684c1582c936e2c003 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so
new file mode 100644
index 000000000..11f928b0b
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so
Binary files differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5
new file mode 100644
index 000000000..392e5cce2
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.md5
@@ -0,0 +1 @@
+0e4b9707f80757f99856755872659f70 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1
new file mode 100644
index 000000000..f2ce9fc3b
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-solaris_sparcv9.so.sha1
@@ -0,0 +1 @@
+dcb89a48fb8e93d79e2b3bc490d4cb17c4d02ea3 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll
new file mode 100644
index 000000000..d98e48d80
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll
Binary files differ
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5
new file mode 100644
index 000000000..4cab4126b
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.md5
@@ -0,0 +1 @@
+be0698efa409d94f0f009c3c5179a0a4 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1
new file mode 100644
index 000000000..7b6c4a70a
--- /dev/null
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16-wince30arm.dll.sha1
@@ -0,0 +1 @@
+b3bd0928d60b99df30356268295d94910dd7b08a \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
index c35dc3ff4..0fd16012a 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom
@@ -2,7 +2,6 @@
<modelVersion>4.0.0</modelVersion>
<groupId>iaik.prod</groupId>
<artifactId>iaik_Pkcs11Wrapper</artifactId>
- <packaging>dll</packaging>
+ <packaging>jar</packaging>
<version>1.2.16</version>
- <description>POM was created from install:install-file</description>
</project> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
index a0aecbbdd..e9a0270f8 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.md5
@@ -1 +1 @@
-cfc860671159b339ec43c9582a9f50e4 \ No newline at end of file
+3903f2c2ec48e9f770b51e6eb3a460db \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
index a588353d1..08f2e3b85 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/1.2.16/iaik_Pkcs11Wrapper-1.2.16.pom.sha1
@@ -1 +1 @@
-3eafa5eae317b8f7160560e7b089285fc95fe636 \ No newline at end of file
+90a1995356174c420a7da5afea2659b3f12276b0 \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
index 1a1b65b5f..0224c7a9f 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml
@@ -8,6 +8,6 @@
<versions>
<version>1.2.16</version>
</versions>
- <lastUpdated>20070814085134</lastUpdated>
+ <lastUpdated>20070831113210</lastUpdated>
</versioning>
</metadata> \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
index a1f79b0ce..77ac4cafe 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.md5
@@ -1 +1 @@
-c38b8b9714dd794e9d4fe257b44f51fe \ No newline at end of file
+1b9037605610bc8bb690baaf52aa938d \ No newline at end of file
diff --git a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1 b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
index d8736b3a3..0b423356d 100644
--- a/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
+++ b/repository/iaik/prod/iaik_Pkcs11Wrapper/maven-metadata.xml.sha1
@@ -1 +1 @@
-6142fc6556cf0b3b8cc4a850acf070df950242e7 \ No newline at end of file
+efa7f6d652e232fa94988009d645445393f3904c \ No newline at end of file
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index 0b47705a2..1ed2ce58e 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -31,7 +31,7 @@
<include>iaik.prod:iaik_ecc</include>
<include>iaik.prod:iaik_jce_full</include>
<include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
</includes>
<outputDirectory>/ext</outputDirectory>
<!-- strip version off the artifact file names -->
@@ -59,13 +59,6 @@
</excludes>
<outputDirectory>/lib</outputDirectory>
</dependencySet>
- <dependencySet>
- <includes>
- <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
- </includes>
- <outputDirectory>/lib/win32</outputDirectory>
- <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
- </dependencySet>
</dependencySets>
<outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping>
<unpack>false</unpack>
@@ -108,6 +101,11 @@
</moduleSet>
</moduleSets>
+ <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
+
+
<files>
<file>
<source>${basedir}/spss/handbook/handbook.html</source>
diff --git a/spss/assembly.xml b/spss/assembly.xml
index 48ee536b2..e7c9e86cc 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -31,7 +31,7 @@
<include>iaik.prod:iaik_ecc</include>
<include>iaik.prod:iaik_jce_full</include>
<include>iaik.prod:iaik_Pkcs11Provider</include>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:jar</include>
</includes>
<outputDirectory>/ext</outputDirectory>
<!-- strip version off the artifact file names -->
@@ -79,15 +79,9 @@
</moduleSet>
</moduleSets>
- <dependencySets>
- <dependencySet>
- <includes>
- <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
- </includes>
- <outputDirectory>/pkcs11/win32</outputDirectory>
- <outputFileNameMapping>pkcs11wrapper.${extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
+ <componentDescriptors>
+ <componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+ </componentDescriptors>
<files>
<file>