aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-08-27 13:10:08 +0000
committermcentner <mcentner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2007-08-27 13:10:08 +0000
commitc6811385cd22e50ebce90900c23dcab79286bdf3 (patch)
tree4cf1e0551062ac51900ba6eef00626e951268299
parent9ede2ad26816afcd3969a3c7e58c4572f38d0c38 (diff)
downloadmoa-id-spss-c6811385cd22e50ebce90900c23dcab79286bdf3.tar.gz
moa-id-spss-c6811385cd22e50ebce90900c23dcab79286bdf3.tar.bz2
moa-id-spss-c6811385cd22e50ebce90900c23dcab79286bdf3.zip
Added a new assembly for the moa-spss library edition distribution. Fixed issue with the inclusion of the pcks11Wrapper.dll in assemblies.
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@964 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--pom.xml4
-rw-r--r--spss/assembly-lib.xml226
-rw-r--r--spss/assembly.xml2
-rw-r--r--spss/server/serverlib/pom.xml15
4 files changed, 237 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index 3ee3fce5a..1938944e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,8 @@
<descriptors>
<descriptor>id/assembly-auth.xml</descriptor>
<descriptor>id/assembly-proxy.xml</descriptor>
- <descriptor>spss/assembly.xml</descriptor>
+ <descriptor>spss/assembly.xml</descriptor>
+ <descriptor>spss/assembly-lib.xml</descriptor>
</descriptors>
</configuration>
</plugin>
@@ -253,7 +254,6 @@
<type>dll</type>
<scope>runtime</scope>
</dependency>
-
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
new file mode 100644
index 000000000..669ef471f
--- /dev/null
+++ b/spss/assembly-lib.xml
@@ -0,0 +1,226 @@
+<assembly>
+ <id>SPSS-lib</id>
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <baseDirectory>moa-spss-lib-${project.version}</baseDirectory>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>MOA.spss.server:moa-spss-lib</include>
+ </includes>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xerces:xmlParserAPIs</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ <!-- strip version off the artifact file names -->
+ <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</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ <!-- 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:xalan</exclude>
+ <exclude>xerces:xercesImpl</exclude>
+ <exclude>xerces:xmlParserAPIs</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>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
+ </includes>
+ <outputDirectory>/lib/win32</outputDirectory>
+ <outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <outputFileNameMapping>moa-spss.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.spss.server:moa-spss-lib</include>
+ </includes>
+ <binaries>
+ <attachmentClassifier>javadoc</attachmentClassifier>
+ <includeDependencies>false</includeDependencies>
+ <outputFileNameMapping>api-doc</outputFileNameMapping>
+ <outputDirectory>/doc</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ <moduleSet>
+ <includes>
+ <include>MOA.spss.server:moa-spss-tools</include>
+ </includes>
+ <binaries>
+ <includeDependencies>true</includeDependencies>
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_moa</include>
+ <include>log4j:log4j</include>
+ <include>xalan:xalan</include>
+ </includes>
+ <outputDirectory>/tools</outputDirectory>
+ <!-- strip version off the artifact file names -->
+ <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
+ <outputDirectory>/tools</outputDirectory>
+ <outputFileNameMapping>tools.${extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+ <files>
+ <file>
+ <source>${basedir}/spss/handbook/handbook.html</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ </files>
+
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/spss/server</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ <excludes>
+ <exclude>readme.src.txt</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/handbook</directory>
+ <outputDirectory>/doc/handbook</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/handbook/clients</directory>
+ <outputDirectory>/doc/clients</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/spss/server/serverlib/resources/licenses</directory>
+ <outputDirectory>/licenses</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <!--
+
+
+ <files>
+ <file>
+ <source>${basedir}/../handbook/handbook.html</source>
+ <outputDirectory>/doc</outputDirectory>
+ </file>
+ </files>
+
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/../../handbook/conf</directory>
+ <outputDirectory>/conf</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../../handbook/handbook</directory>
+ <outputDirectory>/doc/handbook</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../../handbook/clients</directory>
+ <outputDirectory>/doc/clients</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../serverlib/resources/licenses</directory>
+ <outputDirectory>/licenses</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../serverws/data/deploy/tomcat</directory>
+ <outputDirectory>/tomcat</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../serverws/target</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/../serverws/data/deploy/tools</directory>
+ <outputDirectory>/tools</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <includes>
+ <include>MOA.ssps.server:serverwebasdfasdf</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ <include>xerces:xmlParserAPIs</include>
+ </includes>
+ <outputDirectory>/endorsed</outputDirectory>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_Pkcs11Provider</include>
+ </includes>
+ <outputDirectory>/ext</outputDirectory>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.win32:Pkcs11Wrapper</include>
+ </includes>
+ <outputDirectory>/pkcs11/win32</outputDirectory>
+ </dependencySet>
+ <dependencySet>
+ <includes>
+ <include>iaik.prod:iaik_ecc</include>
+ <include>iaik.prod:iaik_jce_full</include>
+ <include>iaik.prod:iaik_moa_full</include>
+ <include>log4j:log4j</include>
+ <include>xalan:xalan</include>
+ </includes>
+ <outputDirectory>/tools</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+
+--></assembly> \ No newline at end of file
diff --git a/spss/assembly.xml b/spss/assembly.xml
index 6649f9763..d861b8ab9 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -38,7 +38,7 @@
</dependencySet>
<dependencySet>
<includes>
- <include>iaik.prod:iaik_Pkcs11Wrapper</include>
+ <include>iaik.prod:iaik_Pkcs11Wrapper:dll:win32</include>
</includes>
<outputDirectory>/pkcs11/win32</outputDirectory>
<outputFileNameMapping>pkcs11wrapper.dll</outputFileNameMapping>
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index d9812f70d..620d3ebd4 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -100,13 +100,14 @@
<artifactId>iaik_Pkcs11Wrapper</artifactId>
<scope>runtime</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>iaik.prod</groupId>-->
-<!-- <artifactId>iaik_Pkcs11Wrapper</artifactId>-->
-<!-- <classifier>win32</classifier>-->
-<!-- <type>dll</type>-->
-<!-- <version>1.0</version>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>iaik.prod</groupId>
+ <artifactId>iaik_Pkcs11Wrapper</artifactId>
+ <classifier>win32</classifier>
+ <type>dll</type>
+ <scope>runtime</scope>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>MOA</groupId>
<artifactId>moa-common</artifactId>