minor build fixes/improvements

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@934 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 89 insertions, 79 deletions

diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 0dd875720..986c4c44a 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -2,34 +2,35 @@
     <id>ID-auth</id>

 

     <formats>

-        <format>zip</format>
+        <format>zip</format>

 <!--        <format>tar.gz</format>-->

     </formats>

 

-	<baseDirectory>moa-id-auth-${project.version}</baseDirectory>
+	<baseDirectory>moa-id-auth-${project.version}</baseDirectory>

 

     <fileSets>

         <fileSet>

             <directory>${basedir}/id/server/data/deploy</directory>

-            <outputDirectory>/</outputDirectory>
-            <excludes>
-                <exclude>**/conf/moa-id/oa/**</exclude>
-            </excludes>
+            <outputDirectory>/</outputDirectory>

+            <excludes>

+                <exclude>**/conf/moa-id/oa/**</exclude>

+                <exclude>**/conf/Catalina/**</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}/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>

@@ -44,62 +45,71 @@
                 <include>readme_1.4.0.txt</include>

             </includes>

         </fileSet>

-    </fileSets>
-
-    <moduleSets>
-        <moduleSet>
-            <includes>
-                <include>MOA.id.server:moa-id-auth</include>
-            </includes>
-            <binaries>
-                <includeDependencies>true</includeDependencies>
-                <outputDirectory>/</outputDirectory>
-                <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
-                <dependencySets>
-                    <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>
-                            <include>iaik.prod:iaik_Pkcs11Wrapper</include>
-                        </includes>
-                        <outputDirectory>/ext</outputDirectory>
-                    </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>/moa-id/doc</outputDirectory>
-                <unpack>true</unpack>
-            </binaries>
-        </moduleSet>
-        <moduleSet>
-            <includes>
-                <include>MOA.id:moa-id-templates</include>
-            </includes>
-            <binaries>
-                <includeDependencies>false</includeDependencies>
-                <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>
-                <outputDirectory>/templates</outputDirectory>
-                <unpack>false</unpack>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
-
-</assembly>
\ No newline at end of file
+        <fileSet>

+            <outputDirectory>/ext</outputDirectory>

+            <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>

+        </fileSet>

+    </fileSets>

+

+    <moduleSets>

+        <moduleSet>

+            <includes>

+                <include>MOA.id.server:moa-id-auth</include>

+            </includes>

+            <binaries>

+                <includeDependencies>false</includeDependencies>

+                <outputDirectory>/</outputDirectory>

+                <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>

+                <dependencySets>

+                    <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>

+                            <include>iaik.prod:iaik_Pkcs11Wrapper</include>

+                        </includes>

+                        <outputDirectory>/ext</outputDirectory>

+                    </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-templates</include>

+            </includes>

+            <binaries>

+                <includeDependencies>false</includeDependencies>

+                <outputFileNameMapping>moaid-templates.war</outputFileNameMapping>

+                <outputDirectory>/templates</outputDirectory>

+                <unpack>false</unpack>

+            </binaries>

+        </moduleSet>

+    </moduleSets>

+

+</assembly>