aboutsummaryrefslogtreecommitdiff
path: root/spss
diff options
context:
space:
mode:
Diffstat (limited to 'spss')
-rw-r--r--spss/assembly-lib.xml14
-rw-r--r--spss/assembly.xml14
2 files changed, 10 insertions, 18 deletions
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>