From b5acc37cbd4dda5bad97a94b424b7a3dd850c97c Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>
Date: Fri, 31 Aug 2007 12:25:16 +0000
Subject: 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
---
 spss/assembly-lib.xml | 14 ++++++--------
 spss/assembly.xml     | 14 ++++----------
 2 files changed, 10 insertions(+), 18 deletions(-)

(limited to 'spss')

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>
-- 
cgit v1.2.3