Merge tag 'MOA-ID-3.1.0' into development_preview

JoinUp Release

1 files changed, 191 insertions, 0 deletions

diff --git a/id/assembly-auth-edu.xml b/id/assembly-auth-edu.xml
new file mode 100644
index 000000000..c11f790e4
--- /dev/null
+++ b/id/assembly-auth-edu.xml
@@ -0,0 +1,191 @@
+<assembly>
+	<id>id-auth-edu-${moa-id-version}</id>
+	
+	<formats>
+		<format>dir</format>
+		<format>zip</format>
+		<!-- <format>tar.gz</format> -->
+	</formats>
+
+	<baseDirectory>moa-id-auth-edu-${moa-id-version}</baseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>${basedir}/id/server/data/deploy</directory>
+			<outputDirectory>/</outputDirectory>
+			<excludes>
+				<exclude>**/conf/Catalina/**</exclude>
+				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+			<outputDirectory>/conf/moa-id/certs/certstore</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/spss/handbook/conf/moa-spss/certstore</directory>
+			<outputDirectory>/conf/moa-spss/certstore</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/id/server/doc</directory>
+			<outputDirectory>/doc</outputDirectory>
+			<excludes>
+				<exclude>${basedir}/id/server/doc/proxy/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>${basedir}/id/server/data/deploy/conf</directory>
+			<outputDirectory>/doc/conf</outputDirectory>
+			<excludes>
+				<exclude>${basedir}/id/server/data/deploy/conf/moa-id-proxy/**</exclude>
+			</excludes>
+		</fileSet>				
+		<fileSet>
+			<directory>${basedir}/id</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>history.txt</include>
+				<include>readme_${moa-id-version}.txt</include>
+			</includes>
+		</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>
+	</fileSets>
+
+	<moduleSets>
+		<moduleSet>
+			<includes>
+				<include>MOA.id.server:moa-id-auth-edu</include>
+			</includes>
+			<binaries>
+				<includeDependencies>true</includeDependencies>
+				<outputDirectory>/</outputDirectory>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+				<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>
+						<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>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+				</dependencySets>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+		
+		<moduleSet>
+			<includes>
+				<include>MOA.id.server:moa-id-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.id:moa-id-configuration</include>
+			</includes>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<outputDirectory>/</outputDirectory>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+			</binaries>
+		</moduleSet>
+		
+		<moduleSet>
+			<includes>
+				<include>MOA.id.server:moa-id-commons</include>
+			</includes>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<outputDirectory>/migration/</outputDirectory>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+				<dependencySets>
+					<dependencySet>
+						<outputDirectory>/migration/dependency-jars</outputDirectory>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+				</dependencySets>
+			</binaries>
+		</moduleSet>
+		
+		<moduleSet>
+			<includes>
+				<include>MOA.id:moa-id-oa</include>
+			</includes>
+			<sources>
+			   <useDefaultExcludes>true</useDefaultExcludes>
+			   <outputDirectory>../</outputDirectory>
+			   <includeModuleDirectory>true</includeModuleDirectory>
+			   <outputDirectoryMapping>/source/${artifactId}/src</outputDirectoryMapping>
+			   <excludes>			           
+         		<exclude>**/target/**</exclude>
+         		<exclude>**/bin/**</exclude>
+      			<exclude>**/.settings/**</exclude>
+			      <exclude>.*</exclude>
+			   </excludes>
+			   <includes>
+						<include>pom.xml</include>
+					</includes>
+			</sources>
+			<binaries>
+				<includeDependencies>false</includeDependencies>
+				<outputDirectory>/</outputDirectory>
+				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+				<unpack>false</unpack>
+				<dependencySets>
+					<dependencySet>
+						<includes>
+							<include>iaik:commons-iaik</include>
+							<include>MOA:moa-common</include>
+						</includes>
+						<outputDirectory>/source/repositority</outputDirectory>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+				</dependencySets>
+			</binaries>
+		</moduleSet>
+
+	</moduleSets>
+
+	<componentDescriptors>
+		<componentDescriptor>component-pkcs11libs.xml</componentDescriptor>
+	</componentDescriptors>
+
+</assembly>