Changeset 32338 for main/trunk
- Timestamp:
- 2018-08-14T18:41:35+12:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/build.xml
r32337 r32338 128 128 https://stackoverflow.com/questions/113224/what-is-the-largest-tcp-ip-network-port-number-allowable-for-ipv4 129 129 --> 130 <!--<if>131 <bool><not><isset property="internal.tomcat.port"/></not></bool>-->132 130 <if> 133 131 <bool> … … 147 145 </not> 148 146 </bool> 149 < echo>ERROR: Unable to set tomcat.port.147 <fail>ERROR: Unable to set tomcat.port. 150 148 In file build.properties server.protocol=${server.protocol} and requires at minimum that its 151 149 matching tomcat.port.${server.protocol} property line be set and is assigned a valid port number. 152 (Ensure any other enabled tomcat port is valid too)</echo> 153 <!--<echo>Uncomment at least the tomcat.${server.protocol}.port line in build.properties.</echo>--> 154 <!--<property name="internal.tomcat.port" value=""/>--> 150 (Ensure any other enabled tomcat port is valid too)</fail> 155 151 <else> 156 152 <condition property="internal.tomcat.port" value="${tomcat.port.https}" else="${tomcat.port.http}"> … … 160 156 </else> 161 157 </if> 162 <!--</if>-->163 158 164 159 <!-- Set autogenerated properties (properties we calculate here in build.xml) … … 1091 1086 <fail if="do.abort">Build aborted by user. Please change your properties settings and re-run the target</fail> 1092 1087 </target> 1093 1094 <!-- Need to list this first in depends for any target that will be using internal.tomcat.port -->1095 <target name="tomcat-init">1096 <if>1097 <bool><not><isset property="internal.tomcat.port"/></not></bool>1098 <fail>ERROR: no tomcat port, so tomcat operations won't proceed.1099 tomcat.${server.protocol}.port is not set or not valid.1100 Correct this in build.properties.</fail>1101 </if>1102 </target>1103 1104 1088 1105 1089 <!-- this sets up some initial properties --> … … 1416 1400 </target> 1417 1401 1418 <target name="configure-web" depends=" tomcat-init,init,perl-for-building"1402 <target name="configure-web" depends="init,perl-for-building" 1419 1403 description="Configure only the web app config files"> 1420 1404 <!-- we want a unix path in the global.properties file --> … … 1586 1570 <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/> 1587 1571 1588 <target name="configure-tomcat-local" depends=" tomcat-init,init,perl-for-building" if="tomcat.islocal">1572 <target name="configure-tomcat-local" depends="init,perl-for-building" if="tomcat.islocal"> 1589 1573 <!-- re-setup the server.xml file --> 1590 1574 <copy file="${basedir}/resources/tomcat/server_tomcat${tomcat.version.major}.xml.in" … … 1667 1651 on how to use this with eclipse 1668 1652 --> 1669 <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends=" tomcat-init,init" if="tomcat.islocal">1653 <target name="debug-start-tomcat" description="Startup Tomcat for debugger" depends="init" if="tomcat.islocal"> 1670 1654 <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 1671 1655 <property name="tomcat.path" refid="local.tomcat.path"/> … … 1733 1717 1734 1718 <!-- Another way: http://ptrthomas.wordpress.com/2006/03/25/how-to-start-and-stop-tomcat-from-ant/ --> 1735 <target name="force-start-tomcat" description="Startup only Tomcat" depends=" tomcat-init,init" if="tomcat.islocal">1719 <target name="force-start-tomcat" description="Startup only Tomcat" depends="init" if="tomcat.islocal"> 1736 1720 1737 1721 <property name="tomcat.classpath" refid="local.tomcat.classpath"/> … … 1787 1771 1788 1772 <!--ant task http: http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/org/apache/tools/ant/taskdefs/condition/Http.html--> 1789 <target name="reconfigure" description="Reconfigure the message router" depends="tomcat-init">1773 <target name="reconfigure" description="Reconfigure the message router"> 1790 1774 <waitfor maxwait="5" maxwaitunit="second"> 1791 1775 <http url="${server.protocol}://${tomcat.server}:${internal.tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c"/> … … 1794 1778 1795 1779 <!--Command-line args to Ant: http://www.jguru.com/faq/view.jsp?EID=471794--> 1796 <target name="reconfigure-collection" description="Reconfigure the collection" depends="tomcat-init">1780 <target name="reconfigure-collection" description="Reconfigure the collection"> 1797 1781 <waitfor maxwait="5" maxwaitunit="second"> 1798 1782 <http url="${server.protocol}://${tomcat.server}:${internal.tomcat.port}${app.path}${server.default.servlet}?a=s&sa=c&sc=${collection}"/> … … 1827 1811 might still be in use for some moments. We test the URL with the http condition since it's likelier to 1828 1812 fail sooner if the server has indeed been stopped. --> 1829 <target name="check-tomcat-running" depends="tomcat-init">1813 <target name="check-tomcat-running"> 1830 1814 <condition property="tomcat.isrunning"> 1831 1815 <!--<http url="${server.protocol}://${tomcat.server}:${internal.tomcat.port}${app.path}"/>--> … … 1855 1839 both stop and start, both of which need to do tomcat checks. Each property can be set only once during 1856 1840 an invocation with ant. So ant restart will need two properties to store each of the tomcat checks --> 1857 <target name="check-tomcat-started" depends="tomcat-init">1841 <target name="check-tomcat-started"> 1858 1842 <condition property="tomcat.isstarted"> 1859 1843 <http url="${server.protocol}://${tomcat.server}:${internal.tomcat.port}"/> … … 2147 2131 </target> 2148 2132 2149 <target name="soap-deploy-site" depends=" tomcat-init,init,get-sitename,get-siteuri,get-webservices,create-deployment-files,deploy-site"2133 <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,get-webservices,create-deployment-files,deploy-site" 2150 2134 description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/> 2151 2135 … … 2160 2144 </target> 2161 2145 2162 <target name="soap-undeploy-site" depends=" tomcat-init,get-undeploy-service-name"2146 <target name="soap-undeploy-site" depends="get-undeploy-service-name" 2163 2147 description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."> 2164 2148 <filter token="servicesname" value="${axis.undeploy.servicename}"/> … … 2178 2162 <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server 2179 2163 with the default servicename of localsite--> 2180 <target name="deploy-localsite" depends=" tomcat-init,init"2164 <target name="deploy-localsite" depends="init" 2181 2165 description="Deploy the SOAP server for localsite. Will start and stop Tomcat."> 2182 2166 <antcall target="force-start-tomcat"/> … … 3489 3473 </target> 3490 3474 3491 <target name="run-collection-tests" depends="tomcat-init">3475 <target name="run-collection-tests"> 3492 3476 <if><bool><not><available file="${basedir}/ext/testing" type="dir"/></not></bool> 3493 3477 <fail>The testing extension is not available. This is required to perform the tests. It can be acquired from SVN by running the command "svn co http://svn.greenstone.org/gs3-extensions/testing/trunk/src testing" in the ext directory of your Greenstone 3 installation. </fail>
Note:
See TracChangeset
for help on using the changeset viewer.