Project

General

Profile

« Previous | Next » 

Revision 701d157e

Added by Andreas Kohlbecker over 13 years ago

updating to version 3.0.1

View differences:

pom.xml
20 20
	   <!-- 
21 21
	       the third number in the version string 
22 22
	   -->
23
	   <project.patchversion>0</project.patchversion>
23
	   <project.patchversion>1</project.patchversion>
24 24
	   <!-- 
25 25
	       ${project.fullversionstring} is being used by some build plugins
26 26
	    -->
src/main/installer/win32/program-folder/etc/CDMServer.conf
1
wrapper.java.classpath.1=./lib/cdm-server-2.5.jar
1
wrapper.java.classpath.1=./lib/cdm-server-3.0.jar
2 2
wrapper.java.library.path.1=./lib/
3 3
wrapper.java.additional.1=-XX:PermSize=128m
4 4
wrapper.java.additional.2=-XX:MaxPermSize=192m
src/main/installer/win32/setup.nsi
2 2
# 28.10.2010 13:58:54
3 3

  
4 4
# TODO : preserve $INSTDIR/.cdmLibrary from being deleted if the user desides to keep it, or just warn the user.
5
# 
6
#  Wiki: http://nsis.sourceforge.net/Main_Page
7
#  see http://nsis.sourceforge.net/Docs/Chapter5.html for Compile Time Command reference
8
#
9

  
5 10

  
6 11
Name "EDIT CDM-Server"
7 12

  
8 13
# General Symbol Definitions
14
!define /date BUILD_TIMESTAMP "%Y%m%d-%H%M%S"
9 15
!define REGKEY "SOFTWARE\$(^Name)"
10 16
!define VERSION 3.0
17
!define PATCH_VERSION 1-${BUILD_TIMESTAMP}
11 18
!define COMPANY "EDIT - European Distributed Institute of Taxonomy"
12 19
!define EDIT_PLATFORM "EDIT Platform for Cybertaxonomy"
13 20
!define URL http://wp5.e-taxonomy.eu/
......
35 42
Page instfiles
36 43

  
37 44
# Installer attributes
38
OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.exe"
45
OutFile "${OUT_FOLDER}\EDIT CDM-Server-${VERSION}.${PATCH_VERSION}.exe"
39 46
InstallDir "$PROGRAMFILES\EDIT CDM-Server"
40 47
CRCCheck on
41 48
XPStyle on
......
43 50
ShowInstDetails show
44 51
AutoCloseWindow false
45 52
LicenseData ..\..\..\..\LICENSE.TXT
46
VIProductVersion 2.5.0.0
53
VIProductVersion 3.0.0.0
47 54
VIAddVersionKey ProductName "$(^Name)"
48 55
VIAddVersionKey ProductVersion "${VERSION}"
49 56
VIAddVersionKey CompanyName "${COMPANY}"
src/main/webapp/index.jsp
72 72
                                                   String noBottomBorder = props.getStatus().equals(CdmInstanceProperties.Status.error) ? " style=\"border-bottom:none;\"" : "";
73 73
                                                   
74 74
	                                        	   out.append("<tr class=\"entry " + oddOrEven + "\" " +noBottomBorder+ ">");
75
	                                        	   out.append("<td class=\"base-url\"><a href=\"" + fullURL + "/portal/taxonTree\">" + basePath + "</a></td>");
75
	                                        	   out.append("<td class=\"base-url\"><a href=\"" + fullURL + "/portal/classification\">" + basePath + "</a></td>");
76 76
                                                   out.append("<td class=\"db-url\">" + props.getUrl() + "</td>");
77 77
                                                   out.append("<td class=\"status " + props.getStatus() + "\">" + props.getStatus() + "</td>");
78 78
                                                   

Also available in: Unified diff