From 30a1080e6eea4144d8f7db603ef2654262b958ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= <tseeker@legacyworlds.com>
Date: Mon, 16 Jan 2012 16:06:44 +0100
Subject: [PATCH] Maven projects fixes and improvements

* Fixed copy of the SQL files to the distribution

* Distribution packages will now execute an automatic clean-up before
assembling. While this will avoid having dirty, old files in the
distribution directory, it also has a negative consequence -
configuration files will be destroyed if they exist.
---
 legacyworlds-server-DIST/pom.xml        | 17 ++++++++++++++++-
 legacyworlds-server-DIST/src/server.xml |  3 ++-
 legacyworlds-web-DIST/pom.xml           | 16 +++++++++++++++-
 legacyworlds/pom.xml                    |  6 ++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/legacyworlds-server-DIST/pom.xml b/legacyworlds-server-DIST/pom.xml
index fc85884..39d7676 100644
--- a/legacyworlds-server-DIST/pom.xml
+++ b/legacyworlds-server-DIST/pom.xml
@@ -24,9 +24,23 @@
 		</dependency>
 	</dependencies>
 
-	<!-- Use the assembly plug-in to generate the distribution -->
 	<build>
 		<plugins>
+			<!-- Clean the target directory before generating the distribution -->
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean-before-assembly</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Use the assembly plug-in to generate the distribution -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
@@ -48,5 +62,6 @@
 				</executions>
 			</plugin>
 		</plugins>
+
 	</build>
 </project>
\ No newline at end of file
diff --git a/legacyworlds-server-DIST/src/server.xml b/legacyworlds-server-DIST/src/server.xml
index 875f9b7..cf10d97 100644
--- a/legacyworlds-server-DIST/src/server.xml
+++ b/legacyworlds-server-DIST/src/server.xml
@@ -46,7 +46,8 @@
 			<directory>../legacyworlds-server-data/db-structure</directory>
 			<outputDirectory>sql</outputDirectory>
 			<includes>
-				<include>**.sql</include>
+				<include>*.sql</include>
+				<include>parts/**</include>
 				<include>db-config.sample.txt</include>
 			</includes>
 		</fileSet>
diff --git a/legacyworlds-web-DIST/pom.xml b/legacyworlds-web-DIST/pom.xml
index e5d3890..a503c67 100644
--- a/legacyworlds-web-DIST/pom.xml
+++ b/legacyworlds-web-DIST/pom.xml
@@ -32,9 +32,23 @@
 		</dependency>
 	</dependencies>
 
-	<!-- Use the assembly plug-in to generate the distribution -->
 	<build>
 		<plugins>
+			<!-- Clean the target directory before generating the distribution -->
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>clean-before-assembly</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- Use the assembly plug-in to generate the distribution -->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
diff --git a/legacyworlds/pom.xml b/legacyworlds/pom.xml
index 6cd929e..0bdde2c 100644
--- a/legacyworlds/pom.xml
+++ b/legacyworlds/pom.xml
@@ -53,6 +53,12 @@
 					<artifactId>tomcat-maven-plugin</artifactId>
 					<version>1.1</version>
 				</plugin>
+				
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clean-plugin</artifactId>
+					<version>2.4.1</version>
+				</plugin>
 
 			</plugins>
 		</pluginManagement>