Changeset 31489 for main/trunk
- Timestamp:
- 2017-03-10T19:16:57+13:00 (7 years ago)
- Location:
- main/trunk/greenstone3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.properties.in
r30672 r31489 3 3 4 4 ## Tomcat installation 5 6 # The protocol (http, https) 7 server.protocol=http 8 5 9 # Set this to the internet/intranet name of the machine that Tomcat is/will be 6 10 # run on. localhost is fine for accessing the server from the local machine, … … 18 22 # The context name of your GS3 digital library. By default this will be "greenstone3". Ensure this has a value. 19 23 greenstone.context=greenstone3 24 25 # solr generally lives off /solr from the base greenstone URL 26 solr.context=solr 27 20 28 21 29 ## If creating a GS3 set up with a dispersed web folder ("web-dispersed" GS3), with GS3 in a read-only location, then -
main/trunk/greenstone3/build.xml
r31142 r31489 835 835 836 836 <target name="get-default-servlet-url"> 837 <echo>http://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}</echo> 838 </target> 837 <echo>${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}</echo> 838 </target> 839 840 <target name="get-solr-servlet-url"> 841 <echo>${server.protocol}://${tomcat.server}:${tomcat.port}/${solr.context}</echo> 842 </target> 839 843 840 844 <target name="check-derbyserver-running"> … … 925 929 </if> 926 930 <if><bool><isset property="install.flax"/></bool> 927 <property name="url" value=" http://${tomcat.server}:${tomcat.port}${app.path}/flax"/>931 <property name="url" value="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/flax"/> 928 932 <else> 929 <property name="url" value=" http://${tomcat.server}:${tomcat.port}${app.path}/"/>933 <property name="url" value="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/"/> 930 934 </else> 931 935 </if> … … 1602 1606 <and> 1603 1607 <socket server="${tomcat.server}" port="${tomcat.port}"/> 1604 <http url=" http://${tomcat.server}:${tomcat.port}${app.path}/index.html"/>1608 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/index.html"/> 1605 1609 </and> 1606 1610 </waitfor> … … 1611 1615 <if><bool><istrue value="${tomcat.isstarted}"/></bool> 1612 1616 <echo>**************************************</echo> 1613 <echo>A WEB SERVER IS ALREADY RUNNING ON http://${tomcat.server}:${tomcat.port}. NOT STARTING.</echo>1617 <echo>A WEB SERVER IS ALREADY RUNNING ON ${server.protocol}://${tomcat.server}:${tomcat.port}. NOT STARTING.</echo> 1614 1618 <echo>**************************************</echo> 1615 1619 <else> … … 1667 1671 <and> 1668 1672 <socket server="${tomcat.server}" port="${tomcat.port}"/> 1669 <http url=" http://${tomcat.server}:${tomcat.port}${app.path}/index.html"/>1673 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/index.html"/> 1670 1674 </and> 1671 1675 </waitfor> … … 1676 1680 <target name="reconfigure" description="Reconfigure the message router"> 1677 1681 <waitfor maxwait="5" maxwaitunit="second"> 1678 <http url=" http://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c"/>1682 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c"/> 1679 1683 </waitfor> 1680 1684 </target> … … 1683 1687 <target name="reconfigure-collection" description="Reconfigure the collection"> 1684 1688 <waitfor maxwait="5" maxwaitunit="second"> 1685 <http url=" http://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c&sc=${collection}"/>1689 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c&sc=${collection}"/> 1686 1690 </waitfor> 1687 1691 </target> … … 1716 1720 <target name="check-tomcat-running"> 1717 1721 <condition property="tomcat.isrunning"> 1718 <!--<http url=" http://${tomcat.server}:${tomcat.port}${app.path}"/>-->1719 <http url=" http://${tomcat.server}:${tomcat.port}"/>1722 <!--<http url="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}"/>--> 1723 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}"/> 1720 1724 </condition> 1721 1725 </target> … … 1726 1730 <target name="check-tomcat-started"> 1727 1731 <condition property="tomcat.isstarted"> 1728 <http url=" http://${tomcat.server}:${tomcat.port}"/>1732 <http url="${server.protocol}://${tomcat.server}:${tomcat.port}"/> 1729 1733 </condition> 1730 1734 </target> … … 2023 2027 <classpath refid="compile.classpath"/> 2024 2028 <arg value="-l"/> 2025 <arg value=" http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/>2029 <arg value="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/> 2026 2030 <arg file="${basedir}/resources/soap/deploy.wsdd"/> 2027 2031 </java> … … 2039 2043 <classpath refid="compile.classpath"/> 2040 2044 <arg value="-l"/> 2041 <arg value=" http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/>2045 <arg value="${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/> 2042 2046 <arg file="${basedir}/resources/soap/undeploy.wsdd"/> 2043 2047 </java> … … 2071 2075 <target name="get-undeploy-service-name" unless="axis.undeploy.servicename"> 2072 2076 <input addproperty="axis.undeploy.servicename" defaultvalue="localsite">Please enter the full name of the service you wish to undeploy. 2073 To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services2077 To find out which web services you've got deployed, point your browser to ${server.protocol}://${tomcat.server}:${tomcat.port}/greenstone3/services 2074 2078 Or press Enter for undeploying the default:localsite /></input> 2075 2079 <echo>Name of service to undeploy: ${axis.undeploy.servicename}</echo> … … 3370 3374 <java classname="org.junit.runner.JUnitCore" fork="true"> 3371 3375 <arg value="gstests.TestClass"/> 3372 <jvmarg value="-DSERVERURL= http://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet} "/>3376 <jvmarg value="-DSERVERURL=${server.protocol}://${tomcat.server}:${tomcat.port}${app.path}${server.default.servlet} "/> 3373 3377 <classpath> 3374 3378 <fileset dir="${basedir}/ext/testing/lib/java">
Note:
See TracChangeset
for help on using the changeset viewer.