Improved and updated maven build process.

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

3 files changed, 0 insertions, 290 deletions

diff --git a/id/server/distribution/assembly-auth.xml b/id/server/distribution/assembly-auth.xml
deleted file mode 100644
index a732c6f64..000000000
--- a/id/server/distribution/assembly-auth.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<assembly>

-	<id>all-auth</id>

-

-	<formats>

-		<format>zip</format>

-	</formats>

-

-	<includeBaseDirectory>false</includeBaseDirectory>

-

-	<fileSets>

-		<fileSet>

-			<directory>${basedir}/../data/deploy</directory>

-			<outputDirectory>/auth</outputDirectory>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../auth/target</directory>

-			<outputDirectory>/auth</outputDirectory>

-			<includes>

-				<include>**/*.war</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../doc</directory>

-			<outputDirectory>/auth/doc</outputDirectory>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../../templates/target</directory>

-			<outputDirectory>/auth/templates</outputDirectory>

-			<includes>

-				<include>**/*.war</include>

-			</includes>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../data/deploy/templates</directory>

-			<outputDirectory>/auth/templates</outputDirectory>

-			<includes>

-				<include>**/*.txt</include>

-			</includes>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../data/deploy/tomcat</directory>

-			<outputDirectory>/auth/tomcat</outputDirectory>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../licenses</directory>

-			<outputDirectory>/auth</outputDirectory>

-			<includes>

-				<include>APACHE-LICENSE-2.0.txt</include>

-				<include>history.txt</include>

-				<include>IAIK-LICENSE.txt</include>

-				<include>readme_1.4.0.txt</include>

-			</includes>

-		</fileSet>		

-	</fileSets>

-

-	<dependencySets>

-		<dependencySet>

-			<includes>

-				<include>xalan:xalan</include>

-				<include>xerces:xercesImpl</include>

-				<include>xerces:xmlParserAPIs</include>

-			</includes>

-			<outputDirectory>/auth/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>jsse:jcert</include>

-				<include>jsse:jnet</include>

-				<include>jsse:jsse</include>

-			</includes>

-			<outputDirectory>/auth/ext13</outputDirectory>

-		</dependencySet>

-		<dependencySet>

-			<includes>

-				<include>iaik.prod:iaik_ecc_signed</include>

-				<include>iaik.prod:iaik_jce_full_signed</include>

-				<include>iaik.prod:iaik_Pkcs11Provider_signed</include>

-			</includes>

-			<outputDirectory>/auth/ext14</outputDirectory>

-		</dependencySet>

-	</dependencySets>

-

-</assembly>
\ No newline at end of file
diff --git a/id/server/distribution/assembly-proxy.xml b/id/server/distribution/assembly-proxy.xml
deleted file mode 100644
index cce9dd02c..000000000
--- a/id/server/distribution/assembly-proxy.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<assembly>

-	<id>all-proxy</id>

-

-	<formats>

-		<format>zip</format>

-	</formats>

-

-	<includeBaseDirectory>false</includeBaseDirectory>

-

-	<fileSets>

-		<fileSet>

-			<directory>${basedir}/../data/deploy</directory>

-			<outputDirectory>/proxy</outputDirectory>

-			<excludes>

-				<exclude>**/conf/moa-spss/**</exclude>

-			</excludes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../proxy/target</directory>

-			<outputDirectory>/proxy</outputDirectory>

-			<includes>

-				<include>**/*.war</include>

-			</includes>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../doc</directory>

-			<outputDirectory>/proxy/doc</outputDirectory>

-		</fileSet>

-		<fileSet>

-			<directory>${basedir}/../../templates/target</directory>

-			<outputDirectory>/proxy/templates</outputDirectory>

-			<includes>

-				<include>**/*.war</include>

-			</includes>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../data/deploy/templates</directory>

-			<outputDirectory>/proxy/templates</outputDirectory>

-			<includes>

-				<include>**/*.txt</include>

-			</includes>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../data/deploy/tomcat</directory>

-			<outputDirectory>/proxy/tomcat</outputDirectory>

-		</fileSet>		

-		<fileSet>

-			<directory>${basedir}/../licenses</directory>

-			<outputDirectory>/proxy</outputDirectory>

-			<includes>

-				<include>APACHE-LICENSE-2.0.txt</include>

-				<include>history.txt</include>

-				<include>IAIK-LICENSE.txt</include>

-				<include>readme_1.4.0.txt</include>

-			</includes>

-		</fileSet>		

-	</fileSets>

-

-	<dependencySets>

-		<dependencySet>

-			<includes>

-				<include>xalan:xalan</include>

-				<include>xerces:xercesImpl</include>

-				<include>xerces:xmlParserAPIs</include>

-			</includes>

-			<outputDirectory>/proxy/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>jsse:jcert</include>

-				<include>jsse:jnet</include>

-				<include>jsse:jsse</include>

-			</includes>

-			<outputDirectory>/proxy/ext13</outputDirectory>

-		</dependencySet>

-		<dependencySet>

-			<includes>

-				<include>iaik.prod:iaik_ecc_signed</include>

-				<include>iaik.prod:iaik_jce_full_signed</include>

-				<include>iaik.prod:iaik_Pkcs11Provider_signed</include>

-			</includes>

-			<outputDirectory>/proxy/ext14</outputDirectory>

-		</dependencySet>

-	</dependencySets>

-

-</assembly>
\ No newline at end of file
diff --git a/id/server/distribution/pom.xml b/id/server/distribution/pom.xml
deleted file mode 100644
index 2bbb3923d..000000000
--- a/id/server/distribution/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

-	<parent>

-		<groupId>MOA.id</groupId>

-		<artifactId>server</artifactId>

-		<version>1.4.0</version>

-	</parent>  

-

-  <modelVersion>4.0.0</modelVersion>

-  <groupId>MOA</groupId>

-  <artifactId>id.server.distribution</artifactId>

-  <packaging>pom</packaging>

-  <version>1.4.0</version>

-  <name>ID-Server-Distribution</name>

-  

-  <properties>

-  	<thirdPartyLib>${basedir}/../../buildhelper</thirdPartyLib>

-  </properties>

-  

-	<build>

-	<plugins>

-		<plugin>

-			<artifactId>maven-assembly-plugin</artifactId>

-			<configuration>

-				<descriptors>

-					<descriptor>./assembly-auth.xml</descriptor>

-					<descriptor>./assembly-proxy.xml</descriptor>

-<!--

-					<descriptor>./assembly-src.xml</descriptor>

--->

-				</descriptors>

-			</configuration>

-			<executions>

-				<execution>

-					<id>make-dist-standalone</id>

-					<phase>package</phase>

-					<goals>

-						<goal>attached</goal>

-					</goals>

-				</execution>

-			</executions>

-		</plugin>

-		</plugins>

-	</build>

-	

-	<dependencies>

-    <dependency>

-      <groupId>xalan</groupId>

-      <artifactId>xalan</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>xerces</groupId>

-      <artifactId>xercesImpl</artifactId>

-    </dependency>

-    <dependency>

-      <groupId>xerces</groupId>

-      <artifactId>xmlParserAPIs</artifactId>

-    </dependency>

-

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_ecc</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_jce_full</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_Pkcs11Provider</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_ecc</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_jce_full</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.prod</groupId>

-      <artifactId>iaik_Pkcs11Provider</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>iaik.win32</groupId>

-      <artifactId>Pkcs11Wrapper</artifactId>

-      <type>dll</type>

-      <version>1.0</version>

-      <scope>runtime</scope>

-    </dependency>

-

-    <dependency>

-      <groupId>jsse</groupId>

-      <artifactId>jcert</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>jsse</groupId>

-      <artifactId>jnet</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-    <dependency>

-      <groupId>jsse</groupId>

-      <artifactId>jsse</artifactId>

-      <scope>runtime</scope>

-    </dependency>

-

-	</dependencies>

-</project>
\ No newline at end of file