Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-idspssHEADmaster

10 files changed, 234 insertions, 0 deletions

diff --git a/assembly/src/main/resources/assembly_auth_edu_v2.xml b/assembly/src/main/resources/assembly_auth_edu_v2.xml
new file mode 100644
index 000000000..36ced7e3d
--- /dev/null
+++ b/assembly/src/main/resources/assembly_auth_edu_v2.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>dist-edu</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <baseDirectory>moa-id-auth-edu-${moa-id-version}</baseDirectory>
+  
+  <fileSets>
+    <!-- Applications -->
+    <fileSet>
+      <directory>${project.parent.basedir}/id/ConfigWebTool/target/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/id/oa/target</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>    
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-edu/target</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>
+    
+    <!-- Configuration, Licence, and Handbook -->
+    <fileSet>
+      <directory>${project.parent.basedir}/id/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>readme_${project.version}.txt</include>
+        <include>history.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>EUPL v.1.1 - Licence.pdf</include>
+        <include>IAIK-LICENSE.txt</include>
+        <include>LICENSE-2.0.txt</include>
+        <include>NOTICE.txt</include>
+        <include>SIC_LICENSE.txt</include>
+      </includes>
+    </fileSet>    
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/conf/</directory>
+      <outputDirectory>./conf</outputDirectory>      
+      <excludes>
+        <exclude>Catalina/**</exclude>
+        <exclude>moa-id-proxy/**</exclude>        
+      </excludes>
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/conf/</directory>
+      <outputDirectory>./doc/conf</outputDirectory>      
+      <excludes>
+        <exclude>Catalina/**</exclude>
+        <exclude>moa-id-proxy/**</exclude>        
+      </excludes>
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/doc/handbook/</directory>
+      <outputDirectory>./doc/handbook</outputDirectory>      
+    </fileSet>         
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/tomcat/</directory>
+      <outputDirectory>./tomcat</outputDirectory>      
+    </fileSet> 
+
+    <!-- Dependencies -->  
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/pkcs11/</directory>
+      <outputDirectory>./pkcs11</outputDirectory>      
+    </fileSet>         
+    
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/endorsed/</directory>
+      <outputDirectory>./endorsed</outputDirectory>      
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-edu/target/moa-id-auth-edu-${moa-id-version}/WEB-INF/lib/</directory>
+      <outputDirectory>./endorsed</outputDirectory>
+      <includes>
+        <include>serializer*.jar</include>
+        <include>xalan*.jar</include>
+        <include>xercesImpl*.jar</include>
+      </includes>      
+    </fileSet>     
+    
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/ext/</directory>
+      <outputDirectory>./ext</outputDirectory>      
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-edu/target/moa-id-auth-edu-${moa-id-version}/WEB-INF/lib/</directory>
+      <outputDirectory>./ext</outputDirectory>
+      <includes>
+        <include>iaik_jce_full*.jar</include>
+      </includes>      
+    </fileSet>  
+    
+  </fileSets>
+
+
+
+</assembly>
diff --git a/assembly/src/main/resources/assembly_auth_final_v2.xml b/assembly/src/main/resources/assembly_auth_final_v2.xml
new file mode 100644
index 000000000..9e07a45ae
--- /dev/null
+++ b/assembly/src/main/resources/assembly_auth_final_v2.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>dist</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <baseDirectory>moa-id-auth-final-${moa-id-version}</baseDirectory>
+  
+  <fileSets>
+    <!-- Applications -->
+    <fileSet>
+      <directory>${project.parent.basedir}/id/ConfigWebTool/target/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/id/oa/target</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>    
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-final/target</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>*.war</include>
+      </includes>
+    </fileSet>
+    
+    <!-- Configuration, Licence, and Handbook -->
+    <fileSet>
+      <directory>${project.parent.basedir}/id/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>readme_${project.version}.txt</include>
+        <include>history.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${project.parent.basedir}/</directory>
+      <outputDirectory>./</outputDirectory>      
+      <includes>
+        <include>EUPL v.1.1 - Licence.pdf</include>
+        <include>IAIK-LICENSE.txt</include>
+        <include>LICENSE-2.0.txt</include>
+        <include>NOTICE.txt</include>
+        <include>SIC_LICENSE.txt</include>
+      </includes>
+    </fileSet>    
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/conf/</directory>
+      <outputDirectory>./conf</outputDirectory>      
+      <excludes>
+        <exclude>Catalina/**</exclude>
+        <exclude>moa-id-proxy/**</exclude>        
+      </excludes>
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/conf/</directory>
+      <outputDirectory>./doc/conf</outputDirectory>      
+      <excludes>
+        <exclude>Catalina/**</exclude>
+        <exclude>moa-id-proxy/**</exclude>        
+      </excludes>
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/doc/handbook/</directory>
+      <outputDirectory>./doc/handbook</outputDirectory>      
+    </fileSet>         
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/data/deploy/tomcat/</directory>
+      <outputDirectory>./tomcat</outputDirectory>      
+    </fileSet> 
+
+    <!-- Dependencies -->  
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/pkcs11/</directory>
+      <outputDirectory>./pkcs11</outputDirectory>      
+    </fileSet>         
+    
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/endorsed/</directory>
+      <outputDirectory>./endorsed</outputDirectory>      
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-final/target/moa-id-auth-final-${moa-id-version}/WEB-INF/lib/</directory>
+      <outputDirectory>./endorsed</outputDirectory>
+      <includes>
+        <include>serializer*.jar</include>
+        <include>xalan*.jar</include>
+        <include>xercesImpl*.jar</include>
+      </includes>      
+    </fileSet>     
+    
+    <fileSet>
+      <directory>${project.basedir}/src/main/resources/data/ext/</directory>
+      <outputDirectory>./ext</outputDirectory>      
+    </fileSet>     
+    <fileSet>
+      <directory>${project.parent.basedir}/id/server/auth-final/target/moa-id-auth-final-${moa-id-version}/WEB-INF/lib/</directory>
+      <outputDirectory>./ext</outputDirectory>
+      <includes>
+        <include>iaik_jce_full*.jar</include>
+      </includes>      
+    </fileSet>  
+    
+  </fileSets>
+
+
+
+</assembly>
diff --git a/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar b/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar
new file mode 100644
index 000000000..817684fb7
--- /dev/null
+++ b/assembly/src/main/resources/data/endorsed/xml-api-iaik-1.1.jar
diff --git a/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar b/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar
new file mode 100644
index 000000000..a348db04e
--- /dev/null
+++ b/assembly/src/main/resources/data/ext/iaik_Pkcs11Provider.jar
diff --git a/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar b/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar
new file mode 100644
index 000000000..940c1824d
--- /dev/null
+++ b/assembly/src/main/resources/data/ext/iaik_Pkcs11Wrapper.jar
diff --git a/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so
new file mode 100644
index 000000000..eacbb13b2
--- /dev/null
+++ b/assembly/src/main/resources/data/pkcs11/linux/libpkcs11wrapper.so
diff --git a/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so
new file mode 100644
index 000000000..c5f7d595f
--- /dev/null
+++ b/assembly/src/main/resources/data/pkcs11/solaris_sparc/libpkcs11wrapper.so
diff --git a/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so b/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so
new file mode 100644
index 000000000..1f58fe949
--- /dev/null
+++ b/assembly/src/main/resources/data/pkcs11/solaris_sparcv9/libpkcs11wrapper.so
diff --git a/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll b/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll
new file mode 100644
index 000000000..c1ee108b8
--- /dev/null
+++ b/assembly/src/main/resources/data/pkcs11/win32/pkcs11wrapper.dll
diff --git a/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll b/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll
new file mode 100644
index 000000000..651a0e5cb
--- /dev/null
+++ b/assembly/src/main/resources/data/pkcs11/win64/pkcs11wrapper.dll