From 701d157eb973cd464175ef18049bec4b973079b1 Mon Sep 17 00:00:00 2001
From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Wed, 12 Jan 2011 11:16:02 +0000
Subject: [PATCH] updating to version 3.0.1

---
 pom.xml                                               |  2 +-
 .../installer/win32/program-folder/etc/CDMServer.conf |  2 +-
 src/main/installer/win32/setup.nsi                    | 11 +++++++++--
 src/main/webapp/index.jsp                             |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index c970d1f..e6e830d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 	   <!-- 
 	       the third number in the version string 
 	   -->
-	   <project.patchversion>0</project.patchversion>
+	   <project.patchversion>1</project.patchversion>
 	   <!-- 
 	       ${project.fullversionstring} is being used by some build plugins
 	    -->
diff --git a/src/main/installer/win32/program-folder/etc/CDMServer.conf b/src/main/installer/win32/program-folder/etc/CDMServer.conf
index be1d232..80efa71 100644
--- a/src/main/installer/win32/program-folder/etc/CDMServer.conf
+++ b/src/main/installer/win32/program-folder/etc/CDMServer.conf
@@ -1,4 +1,4 @@
-wrapper.java.classpath.1=./lib/cdm-server-2.5.jar
+wrapper.java.classpath.1=./lib/cdm-server-3.0.jar
 wrapper.java.library.path.1=./lib/
 wrapper.java.additional.1=-XX:PermSize=128m
 wrapper.java.additional.2=-XX:MaxPermSize=192m
diff --git a/src/main/installer/win32/setup.nsi b/src/main/installer/win32/setup.nsi
index b63ada2..4ceeb49 100644
--- a/src/main/installer/win32/setup.nsi
+++ b/src/main/installer/win32/setup.nsi
@@ -2,12 +2,19 @@
 # 28.10.2010 13:58:54
 
 # TODO : preserve $INSTDIR/.cdmLibrary from being deleted if the user desides to keep it, or just warn the user.
+# 
+#  Wiki: http://nsis.sourceforge.net/Main_Page
+#  see http://nsis.sourceforge.net/Docs/Chapter5.html for Compile Time Command reference
+#
+
 
 Name "EDIT CDM-Server"
 
 # General Symbol Definitions
+!define /date BUILD_TIMESTAMP "%Y%m%d-%H%M%S"
 !define REGKEY "SOFTWARE\$(^Name)"
 !define VERSION 3.0
+!define PATCH_VERSION 1-${BUILD_TIMESTAMP}
 !define COMPANY "EDIT - European Distributed Institute of Taxonomy"
 !define EDIT_PLATFORM "EDIT Platform for Cybertaxonomy"
 !define URL http://wp5.e-taxonomy.eu/
@@ -35,7 +42,7 @@ Page custom StartMenuGroupSelect "" ": Start Menu Folder"
 Page instfiles
 
 # Installer attributes
-OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.exe"
+OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.${PATCH_VERSION}.exe"
 InstallDir "$PROGRAMFILES\EDIT CDM-Server"
 CRCCheck on
 XPStyle on
@@ -43,7 +50,7 @@ Icon "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
 ShowInstDetails show
 AutoCloseWindow false
 LicenseData ..\..\..\..\LICENSE.TXT
-VIProductVersion 2.5.0.0
+VIProductVersion 3.0.0.0
 VIAddVersionKey ProductName "$(^Name)"
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 8add78f..d624fea 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -72,7 +72,7 @@
                                                    String noBottomBorder = props.getStatus().equals(CdmInstanceProperties.Status.error) ? " style=\"border-bottom:none;\"" : "";
                                                    
 	                                        	   out.append("<tr class=\"entry " + oddOrEven + "\" " +noBottomBorder+ ">");
-	                                        	   out.append("<td class=\"base-url\"><a href=\"" + fullURL + "/portal/taxonTree\">" + basePath + "</a></td>");
+	                                        	   out.append("<td class=\"base-url\"><a href=\"" + fullURL + "/portal/classification\">" + basePath + "</a></td>");
                                                    out.append("<td class=\"db-url\">" + props.getUrl() + "</td>");
                                                    out.append("<td class=\"status " + props.getStatus() + "\">" + props.getStatus() + "</td>");
                                                    
-- 
2.34.1