Merge branch 'Branch_MOA-ID-3.2.1' into development_preview

# Conflicts:
#	id/server/moa-id-commons/pom.xml
#	pom.xml

1 files changed, 0 insertions, 163 deletions

diff --git a/spss/assembly.xml b/spss/assembly.xml
deleted file mode 100644
index 20673b198..000000000
--- a/spss/assembly.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<assembly>
-	<id>spss-${moa-spss-version}</id>
-	
-	<formats>
-		<format>dir</format>
-		<format>zip</format>
-<!-- 		<format>tar.gz</format> -->
-	</formats>
-
-	<baseDirectory>moa-spss-${moa-spss-version}</baseDirectory>
-
-	<moduleSets>
-		<moduleSet>
-			<includes>
-				<include>MOA.spss.server:moa-spss-ws</include>
-			</includes>
-			<binaries>
-				<includeDependencies>true</includeDependencies>
-				<dependencySets>
-					<dependencySet>
-						<includes>
-							<include>xalan-bin-dist:xalan</include>
-							<include>xerces:xercesImpl</include>
-							<include>xalan-bin-dist:xml-apis</include>
-							<include>xalan-bin-dist:serializer</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:jar</include>
-						</includes>
-						<outputDirectory>/ext</outputDirectory>
-						<!-- strip version off the artifact file names -->
-						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-					</dependencySet>
-					<dependencySet>
-						<includes>
-							<include>javax.servlet:servlet-api</include>
-							<include>javax.activation:activation</include>
-							<include>axis:axis</include>
-							<include>org.apache.axis:axis-jaxrpc</include>
-							<include>org.apache.axis:axis-saaj</include>
-							<include>axis:axis-wsdl4j</include>
-							<include>commons-discovery:commons-discovery</include>
-							<include>commons-logging:commons-logging</include>
-							<include>javax.mail:mail</include>
-							<include>xalan-bin-dist:serializer</include>
-							<include>xerces:xercesImpl</include>
-						</includes>
-						<outputDirectory>/doc/clients/webservice/lib</outputDirectory>
-						<!-- strip version off the artifact file names -->
-						<outputFileNameMapping>${artifactId}-${version}.${extension}</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_ecc</include>
-							<include>iaik.prod:iaik_jce_full</include>
-							<include>iaik.prod:iaik_moa</include>
-							<include>log4j:log4j</include>
-							<include>xalan-bin-dist: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>
-
-	<componentDescriptors>
-		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
-	</componentDescriptors>
-
-	<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}</directory>
-			<outputDirectory>/</outputDirectory>
-			<includes>
-				<include>LICENSE-2.0.txt</include>
-				<include>NOTICE.txt</include>
-				<include>IAIK-LICENSE.txt</include>
-				<include>EUPL v.1.1 - Licence.pdf</include>	
-				<include>SIC_LICENSE.txt</include>
-			</includes>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/spss/server/serverws/data/deploy/tomcat</directory>
-			<outputDirectory>/tomcat</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/spss/server/serverws/data/deploy/tools</directory>
-			<outputDirectory>/tools</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>${basedir}/spss/server/tools/src/main/scripts</directory>
-			<outputDirectory>/tools</outputDirectory>
-		</fileSet>
-	</fileSets>
-
-</assembly>