Index: /main/trunk/greenstone3/build.properties.in
===================================================================
--- /main/trunk/greenstone3/build.properties.in (revision 31488)
+++ /main/trunk/greenstone3/build.properties.in (revision 31489)
@@ -3,4 +3,8 @@
## Tomcat installation
+
+# The protocol (http, https)
+server.protocol=http
+
# 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,
@@ -18,4 +22,8 @@
# The context name of your GS3 digital library. By default this will be "greenstone3". Ensure this has a value.
greenstone.context=greenstone3
+
+# solr generally lives off /solr from the base greenstone URL
+solr.context=solr
+
## If creating a GS3 set up with a dispersed web folder ("web-dispersed" GS3), with GS3 in a read-only location, then
Index: /main/trunk/greenstone3/build.xml
===================================================================
--- /main/trunk/greenstone3/build.xml (revision 31488)
+++ /main/trunk/greenstone3/build.xml (revision 31489)
@@ -835,6 +835,10 @@
- http://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}
-
+ ${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}
+
+
+
+ ${server.protocol}://${tomcat.server}:${tomcat.port}/${solr.context}
+
@@ -925,7 +929,7 @@
-
+
-
+
@@ -1602,5 +1606,5 @@
-
+
@@ -1611,5 +1615,5 @@
**************************************
- A WEB SERVER IS ALREADY RUNNING ON http://${tomcat.server}:${tomcat.port}. NOT STARTING.
+ A WEB SERVER IS ALREADY RUNNING ON ${server.protocol}://${tomcat.server}:${tomcat.port}. NOT STARTING.**************************************
@@ -1667,5 +1671,5 @@
-
+
@@ -1676,5 +1680,5 @@
-
+
@@ -1683,5 +1687,5 @@
-
+
@@ -1716,6 +1720,6 @@
-
-
+
+
@@ -1726,5 +1730,5 @@
-
+
@@ -2023,5 +2027,5 @@
-
+
@@ -2039,5 +2043,5 @@
-
+
@@ -2071,5 +2075,5 @@
Please enter the full name of the service you wish to undeploy.
-To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services
+To find out which web services you've got deployed, point your browser to ${server.protocol}://${tomcat.server}:${tomcat.port}/greenstone3/services
Or press Enter for undeploying the default:localsite />
Name of service to undeploy: ${axis.undeploy.servicename}
@@ -3370,5 +3374,5 @@
-
+