Changeset 33462 for main

Timestamp:

2019-09-11T20:10:59+12:00 (5 years ago)

Author:

ak19

Message:

Tested new tomcat.allowLinking property on Windows too now and it behaves correctly. Cleaning up debug statements and moving properties in build.properties around so that https related proeprties remain grouped together as before.

Location:

main/trunk/greenstone3

Files:

• build.properties.svn (modified) (2 diffs)
• build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.properties.svn

@@ -3 +3 @@
 
 ## Tomcat installation
-
-# Set this to the internet/intranet name of the machine that Tomcat is/will be 
-# run on. localhost is fine for accessing the server from the local machine, 
-# but not remotely
-tomcat.server=localhost
 
 # Allow/disallow symlinks inside the web application
@@ -16 +11 @@
 # you should ensure this value remains set to false for security reasons.
 tomcat.user.allowLinking=false
+
+# Set this to the internet/intranet name of the machine that Tomcat is/will be 
+# run on. localhost is fine for accessing the server from the local machine, 
+# but not remotely
+tomcat.server=localhost
 
 # server.protocols must contain 'http' or 'https' or both (in order of preference) separated by commas

main/trunk/greenstone3/build.xml

@@ -97 +97 @@
     <os family="windows"/>
   </condition>
-
-  <echo>@@@@@@@@@@@@ Current OS iswindows: ${current.os.iswindows}</echo>
 
   <!-- create build.properties if it has not been created yet -->
@@ -154 +152 @@
     </if>
   </if>
-  
-  <echo>@@@@@@ tomcat.allowLinking is set to ${tomcat.allowLinking}</echo>
-  <echo>tomcat.user.allowLinking is set to ${tomcat.user.allowLinking}</echo>
   
   <if>