From cc533ba77c930e306ae46c761a70c1872fc7057f Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Mon, 15 Aug 2011 15:26:44 +0000
Subject: [PATCH 1/1] Finalizing nightly builds

---
 eu.etaxonomy.taxeditor/deploy_nightly.sh      | 10 ++++-----
 .../eu.etaxonomy.taxeditor.product            |  2 +-
 eu.etaxonomy.taxeditor/pom.xml                | 22 +++++++++++++++++++
 pom.xml                                       | 18 +++++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/eu.etaxonomy.taxeditor/deploy_nightly.sh b/eu.etaxonomy.taxeditor/deploy_nightly.sh
index 2cb8ea7c9..8da863d4c 100755
--- a/eu.etaxonomy.taxeditor/deploy_nightly.sh
+++ b/eu.etaxonomy.taxeditor/deploy_nightly.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# testing
+# local testing
 #WORKSPACE="/Users/n.hoffmann/Documents/workspace/taxeditor/trunk"
 
 PRODUCT_DIR="$WORKSPACE/eu.etaxonomy.taxeditor/target/products"
@@ -10,14 +10,14 @@ DEPLOYMENT_DIR="/var/www/download/taxeditor/nightly"
 
 # bash check if directory exists
 if [ ! -d $PRODUCT_DIR ]; then
-	echo "Target directory does not exist: $PRODUCT_DIR" 
+	echo "Product directory does not exist: $PRODUCT_DIR" 
 	exit 1
 fi 
 
-PRODUCTS=$(ls  $PRODUCT_DIR/eu.etaxonomy.taxeditor.product-*.zip)
+PRODUCTS=$(ls $PRODUCT_DIR/eu.etaxonomy.taxeditor.product-*.zip)
 
-if [ ! -e $PRODUCTS ]; then
-	echo "No products in target folder."
+if [ ! $PRODUCTS ]; then
+	echo "No products in product directory: $PRODUCT_DIR"
 	exit 1
 fi
 
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index acc858c06..367316b17 100644
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -26,7 +26,7 @@
       startupProgressRect="5,447,366,15"
       startupMessageRect="7,432,360,20"
       startupForegroundColor="000000" />
-   <launcher name="eclipse">
+   <launcher name="TaxonomicEditor">
       <solaris/>
       <win useIco="false">
          <bmp/>
diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index 6724529f3..c57c91e87 100644
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -42,6 +42,28 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+			    <!--
+			      	Problems with the wagon-maven-plugin have been encounterd on Windows,
+					it should work properly on linux though.
+				 -->
+				<executions>
+					<execution>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<fromDir>target/products</fromDir>
+					<includes>*.zip</includes>
+					<url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/${project.version}</url>
+					<serverId>wp5.e-taxonomy.eu</serverId>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/pom.xml b/pom.xml
index 98a0f381f..019486cde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,10 +238,19 @@
 					</additionalProjectnatures>
 				</configuration>
 			</plugin>
+			<!-- ====== DEPLOY ====== -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.5</version>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+					<autoVersionSubmodules>false</autoVersionSubmodules>
+					<!--preparationGoals>clean verify install</preparationGoals-->
+					<!--goals>deploy</goals-->
+					<!-- skipping site-deploy by explicitly configuring the goal here -->
+					<tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
+				</configuration>
 			</plugin>
 		</plugins>
 		<pluginManagement>
@@ -251,6 +260,11 @@
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.3.1</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>wagon-maven-plugin</artifactId>
+					<version>1.0-beta-3</version>
+				</plugin>
 				<!--plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-packaging-plugin</artifactId>
-- 
2.34.1