updating to version 3.0.1

diff --git a/pom.xml b/pom.xml
index c970d1fe75620a3789fcf44d49f6c898211d14c4..e6e830db4705250dd929d1e48eb0a8821d6b2ff9 100644 (file)
--- 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 be1d23276764e1402aed04a2ab95bb551b81dd1f..80efa71da3b49078a5712046e479634c5fd793ad 100644 (file)
--- 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\r
+wrapper.java.classpath.1=./lib/cdm-server-3.0.jar\r
 wrapper.java.library.path.1=./lib/\r
 wrapper.java.additional.1=-XX:PermSize=128m\r
 wrapper.java.additional.2=-XX:MaxPermSize=192m\r

diff --git a/src/main/installer/win32/setup.nsi b/src/main/installer/win32/setup.nsi
index b63ada236c03ba1655be0419029b920c12945846..4ceeb49c1af3ca314d19219a7513fd804620d7e2 100644 (file)
--- a/src/main/installer/win32/setup.nsi
+++ b/src/main/installer/win32/setup.nsi
@@ -2,12 +2,19 @@
 # 28.10.2010 13:58:54\r
 \r
 # TODO : preserve $INSTDIR/.cdmLibrary from being deleted if the user desides to keep it, or just warn the user.\r
+# \r
+#  Wiki: http://nsis.sourceforge.net/Main_Page\r
+#  see http://nsis.sourceforge.net/Docs/Chapter5.html for Compile Time Command reference\r
+#\r
+\r
 \r
 Name "EDIT CDM-Server"\r
 \r
 # General Symbol Definitions\r
+!define /date BUILD_TIMESTAMP "%Y%m%d-%H%M%S"\r
 !define REGKEY "SOFTWARE\$(^Name)"\r
 !define VERSION 3.0\r
+!define PATCH_VERSION 1-${BUILD_TIMESTAMP}\r
 !define COMPANY "EDIT - European Distributed Institute of Taxonomy"\r
 !define EDIT_PLATFORM "EDIT Platform for Cybertaxonomy"\r
 !define URL http://wp5.e-taxonomy.eu/\r
@@ -35,7 +42,7 @@ Page custom StartMenuGroupSelect "" ": Start Menu Folder"
 Page instfiles\r
 \r
 # Installer attributes\r
-OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.exe"\r
+OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.${PATCH_VERSION}.exe"\r
 InstallDir "$PROGRAMFILES\EDIT CDM-Server"\r
 CRCCheck on\r
 XPStyle on\r
@@ -43,7 +50,7 @@ Icon "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
 ShowInstDetails show\r
 AutoCloseWindow false\r
 LicenseData ..\..\..\..\LICENSE.TXT\r
-VIProductVersion 2.5.0.0\r
+VIProductVersion 3.0.0.0\r
 VIAddVersionKey ProductName "$(^Name)"\r
 VIAddVersionKey ProductVersion "${VERSION}"\r
 VIAddVersionKey CompanyName "${COMPANY}"\r

diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 8add78f944237334bbd62f692637b2cd0307b1ad..d624feac838c5d59224a805916429cc7d44a50c6 100644 (file)
--- 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>");