Changeset 30568 for main/trunk/greenstone3
- Timestamp:
- 2016-06-10T22:11:15+12:00 (8 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.properties.in
r29977 r30568 15 15 # uncomment the following if you have moved the greenstone3 web directory to tomcats webapps dir 16 16 #web.home=${tomcat.installed.path}/webapps/greenstone3 17 18 ## If creating a distributed GS3 set up, with GS3 in a read-only location, then it will need a 19 ## distinct user web folder for content (sites and collections), and need to run tomcat from TMP. 20 ## You need to configure 4 properties to get a distributed GS3 to work on windows: 21 ## - set web.home above to the writable location where collections and sites should be created (use forward slashes) 22 ## - uncomment using.user.web below and set to true, 23 ## To make tomcat run from TMP folder (a writable location): 24 ## - set gsdl3home.isreadonly to true and 25 ## - set gsdl3.writablehome to ${java.io.tmpdir}/greenstone/web (use forward slashes) 26 # using.user.web=true 17 27 18 28 # Default derby networked server portnumber is 1527, can change this here in case of conflict -
main/trunk/greenstone3/build.xml
r30304 r30568 169 169 <property name="web.home" value="${basedir}/web"/> 170 170 <property name="web.writablehome" value="${gsdl3.writablehome}"/> 171 171 <!-- If using a distributed GS3, then the user web would not contain everything in the default GS3 web 172 (it won't contain a CGI or lib folder inside WEB-INF, for instance) --> 173 <if> 174 <bool><available file="${web.home}/WEB-INF/cgi" type="dir"/></bool> 175 <property name="full.web.dir" value="${web.home}"/> 176 <else> 177 <property name="full.web.dir" value="${basedir}/web"/> 178 </else> 179 </if> 180 172 181 <!-- jar files needed by applets go here --> 173 182 <property name="web.applet" value="${web.home}/applet"/> 174 183 175 184 <!-- jar files needed by the servlet (and extra ones) go here --> 176 185 <property name="web.lib" value="${web.home}/WEB-INF/lib"/> … … 235 244 preservelastmodified="true" 236 245 failonerror="true" > 237 <fileset dir="${ web.home}/WEB-INF" includes="**"/>246 <fileset dir="${full.web.dir}/WEB-INF" includes="**"/> 238 247 </copy> 239 248 … … 631 640 632 641 <path id="derby.server.classpath"> 633 <pathelement location="${web. lib}/derbynet.jar"/>634 <pathelement location="${web. lib}/derby.jar"/>642 <pathelement location="${web.writablelib}/derbynet.jar"/> 643 <pathelement location="${web.writablelib}/derby.jar"/> 635 644 </path> 636 645 … … 1272 1281 <bool><not><equals arg1="${web.home}" arg2="${web.writablehome}"></equals></not></bool> 1273 1282 <mkdir dir="${web.writablehome}"/> 1274 <copy file="${ web.home}/WEB-INF/cgi/gliserver.pl" tofile="${web.writablehome}/WEB-INF/cgi/gliserver.pl" overwrite="true"/>1275 <copy file="${ web.home}/WEB-INF/cgi/metadata-server.pl" tofile="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" overwrite="true"/>1276 <copy file="${ web.home}/WEB-INF/cgi/checksum.pl" tofile="${web.writablehome}/WEB-INF/cgi/checksum.pl" overwrite="true"/>1283 <copy file="${full.web.dir}/WEB-INF/cgi/gliserver.pl" tofile="${web.writablehome}/WEB-INF/cgi/gliserver.pl" overwrite="true"/> 1284 <copy file="${full.web.dir}/WEB-INF/cgi/metadata-server.pl" tofile="${web.writablehome}/WEB-INF/cgi/metadata-server.pl" overwrite="true"/> 1285 <copy file="${full.web.dir}/WEB-INF/cgi/checksum.pl" tofile="${web.writablehome}/WEB-INF/cgi/checksum.pl" overwrite="true"/> 1277 1286 </if> 1278 1287 -
main/trunk/greenstone3/gs3-server.bat
r27903 r30568 16 16 if "%GSDL3SRCHOME%" == "" call "%GSDL3PATH%\gs3-setup.bat" SetEnv > nul 17 17 18 set USE_TMPDIR_FOR_TOMCAT= 19 for /F "tokens=1,2 delims==" %%G in (%GSDL3SRCHOME%\build.properties) do ( 20 if "%%G"=="gsdl3home.isreadonly" set USE_TMPDIR_FOR_TOMCAT=%%H 21 ) 18 22 23 :: If the gsdl3.home readonly property is not already set to true, then 19 24 :: See if Greenstone3 web folder is writable 25 if "%USE_TMPDIR_FOR_TOMCAT%" == "false" ( 20 26 echo. 21 27 echo Checking if the Greenstone3 web directory is writable ... 22 28 (echo This is a temporary file. It is safe to delete it. > "%GSDL3HOME%\testing.tmp" ) 2>nul 23 29 if exist "%GSDL3HOME%\testing.tmp" goto isWritable 30 ) 24 31 25 32 :: Is read-only 26 33 set gsdl3_writablehome=%TMP%\greenstone\web 27 34 set opt_properties="-Dgsdl3home.isreadonly=true" -Dgsdl3.writablehome="%gsdl3_writablehome%" 28 echo ... no.35 if "%USE_TMPDIR_FOR_TOMCAT%" == "false" echo ... no. 29 36 echo Setting Greenstone3 web home writable area to be: %gsdl3_writablehome% 30 37 -
main/trunk/greenstone3/gs3-setup.bat
r27832 r30568 36 36 :: set GSDL3HOME to the 'web' subdirectory 37 37 set GSDL3HOME=!GSDL3SRCHOME!\web 38 set TOMCATWEB=!GSDL3SRCHOME!\web 39 :: set GSDL3HOME to any web.home property provided, and create that folder if it doesn't exist 40 :: Replace forward slashes in web.home with back slashes 41 :: http://scripts.dragon-it.co.uk/scripts.nsf/docs/batch-search-replace-substitute!OpenDocument&ExpandSection=3&BaseTarget=East&AutoFramed 42 if exist "!GSDL3SRCHOME!\build.properties" for /F "tokens=1,2 delims==" %%G in (!GSDL3SRCHOME!\build.properties) do ( 43 if "%%G"=="web.home" ( 44 set GSDL3HOME=%%H 45 set GSDL3HOME=!GSDL3HOME:/=\! 46 set TOMCATWEB=!GSDL3HOME! 47 if not exist "!GSDL3HOME!" cmd /c "!GSDL3SRCHOME!\userweb.cmd" 48 ) 49 ) 50 51 :: Whatever the web directory is, it should contain the WEB-INF\classes folder, else go back to using default for this 52 :: The WEB-INF\classes folder will be absent in a userweb folder, but will be present if GSDL3HOME=GSDL3SRCHOME\web 53 :: or if web.home points to GS3 as a webapp inside tomcat 54 if not exist "!GSDL3HOME!\WEB-INF\classes" set TOMCATWEB=!GSDL3SRCHOME!\web 38 55 39 56 :: change if using external tomcat or ant … … 46 63 :: ---- Set the CLASSPATH and PATH environment variables ---- 47 64 if "!GS_CP_SET!" == "yes" goto skipSetCp 48 set CLASSPATH=! GSDL3HOME!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!;65 set CLASSPATH=!TOMCATWEB!\WEB-INF\classes;!GSDL3SRCHOME!\resources\java;!GSDL3SRCHOME!\cp.jar;!CLASSPATH!; 49 66 set PATH=!GSDL3SRCHOME!\bin;!GSDL3SRCHOME!\bin\script;!GSDL3SRCHOME!\lib\jni;!ANT_HOME!\bin;!PATH! 50 67
Note:
See TracChangeset
for help on using the changeset viewer.