|
58 | 58 | <echo message="startmysql - start a local copy of MySQL (DEPRECATED)" />
|
59 | 59 | <echo message="stopmysql - stop the local copy of MySQL (DEPRECATED)" />
|
60 | 60 | <echo message="-------------------------------------------------------------------------------"/>
|
61 |
| - <echo message="rungui - display the MOVES Master user interface"/> |
| 61 | + <echo message="rungui - display the main MOVES user interface"/> |
62 | 62 | <echo message="runworker - display the MOVES Worker user interface"/>
|
63 |
| - <echo message="crungui - compile and run the MOVES Master user interface"/> |
| 63 | + <echo message="crungui - compile and run the main MOVES user interface"/> |
64 | 64 | <echo message="crunworker - compile and run the MOVES Worker user interface"/>
|
65 | 65 | <echo message="-------------------------------------------------------------------------------"/>
|
66 | 66 | <echo message="1worker - start 1 local worker using the manyworkers.txt configuration " />
|
67 |
| - <echo message=" file. If running on the same computer as MOVES Master, this" /> |
| 67 | + <echo message=" file. If running on the same computer as main MOVES, this" /> |
68 | 68 | <echo message=" should be run in a separate command window. The worker will" />
|
69 | 69 | <echo message=" shutdown after there have been no TODO or InProgress files " />
|
70 | 70 | <echo message=" present for 2 minutes. Before using, edit manyworkers.txt to use" />
|
|
91 | 91 | <echo message=" using, edit maketodo.txt to use your system's " />
|
92 | 92 | <echo message=" sharedDistributedFolderPath." />
|
93 | 93 | <echo message=" ant maketodo -Drunspec=c:\myrunspecs\runspec1.mrs" />
|
94 |
| - <echo message="master1worker -start MOVES with a single worker and wait for its DONE files." /> |
| 94 | + <echo message="main1worker - start MOVES with a single worker and wait for its DONE files." /> |
95 | 95 | <echo message=" Like maketodo, use -Drunspec= to specify the runspec. Before " />
|
96 | 96 | <echo message=" using, edit both maketodo.txt and manyworkers.txt for your " />
|
97 |
| - <echo message=" system's master and worker path settings." /> |
98 |
| - <echo message=" ant master1worker -Drunspec=c:\myrunspecs\runspec1.mrs" /> |
| 97 | + <echo message=" system's masterFolderPath and workFolderPath settings, " /> |
| 98 | + <echo message=" respectively." /> |
| 99 | + <echo message=" ant main1worker -Drunspec=c:\myrunspecs\runspec1.mrs" /> |
99 | 100 | <echo message="pickup - start MOVES to only pickup DONE files. Use -Dpdspec= to name the" />
|
100 | 101 | <echo message=" PDSpec XML file that will be used. Before using, edit " />
|
101 | 102 | <echo message=" maketodo.txt to use your system's sharedDistributedFolderPath." />
|
|
112 | 113 | <echo message="setlogin - store database user and password if the defaults have changed" />
|
113 | 114 | <echo message=" ant setlogin -Duser=moves -Dpassword=secret" />
|
114 | 115 | <echo message="-------------------------------------------------------------------------------"/>
|
115 |
| - <echo message="convert2014_3 - convert a MOVES2014 database for use with MOVES3. Specify" /> |
116 |
| - <echo message=" the name of the starting database with -Dinput= and name the" /> |
117 |
| - <echo message=" resulting database with -Doutput= argument. IMPORTANT: see" /> |
118 |
| - <echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" /> |
119 |
| - <echo message=" ant convert2014_3 -Dinput=m2014_in -Doutput=m3_in" /> |
120 |
| - <echo message="convert2014ab_3 - convert a MOVES2014a/b database for use with MOVES3. Specify" /> |
121 |
| - <echo message=" the name of the starting database with -Dinput= and name the" /> |
122 |
| - <echo message=" resulting database with -Doutput= argument. IMPORTANT: see" /> |
123 |
| - <echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" /> |
124 |
| - <echo message=" ant convert2014ab_3 -Dinput=m2014b_in -Doutput=m3_in" /> |
| 116 | + <echo message="convert3_db_to_4 - convert a MOVES3 database for use with MOVES4. Specify" /> |
| 117 | + <echo message=" the name of the starting database with -Dinput= and name the" /> |
| 118 | + <echo message=" resulting database with -Doutput= argument. IMPORTANT: see" /> |
| 119 | + <echo message=" database\ConversionScripts\InputDatabaseConverstionHelp.pdf" /> |
| 120 | + <echo message=" ant convert3_db_to_4 -Dinput=m3_in -Doutput=m4_in" /> |
125 | 121 | <echo message="-------------------------------------------------------------------------------"/>
|
126 | 122 | <echo message="dbimporter - run the MOVES Data Importers. IMPORTANT: Generate XML " />
|
127 | 123 | <echo message=" file from the Tools tab of the County or Project Data " />
|
|
156 | 152 | <echo message="-------------------------------------------------------------------------------"/>
|
157 | 153 | <echo message="run - Execute a runspec. " />
|
158 | 154 | <echo message=" Use -Drunspec= to name the one runspec that will be used." />
|
159 |
| - <echo message=" ant run -Drunspec=c:\myrunspecs\runspec1.mrs" /> |
| 155 | + <echo message=" ant run -Drunspec=c:\myrunspecs\runspec1.mrs" /> |
| 156 | + |
160 | 157 | </target>
|
161 | 158 |
|
162 | 159 | <path id="classpath">
|
|
899 | 896 | <var name="didstartmysql" value="1" />
|
900 | 897 | </else>
|
901 | 898 | </if>
|
902 |
| - <echo>Launching the master...</echo> |
| 899 | + <echo>Launching MOVES...</echo> |
903 | 900 | <java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
|
904 | 901 | <sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
|
905 | 902 | <classpath refid="classpath" />
|
906 | 903 | <arg value="-onlytodo" />
|
907 | 904 | <arg value="-r" />
|
908 | 905 | <arg value="${runspec}" />
|
909 | 906 | </java>
|
910 |
| - <echo>Master finished.</echo> |
| 907 | + <echo>MOVES finished.</echo> |
911 | 908 | <if>
|
912 | 909 | <equals arg1="${didstartmysql}" arg2="1" />
|
913 | 910 | <then>
|
|
918 | 915 | <arg value="--shutdown_timeout=30" />
|
919 | 916 | <arg value="shutdown" />
|
920 | 917 | </exec>
|
921 |
| - <echo>Master and mysql have been shutdown.</echo> |
| 918 | + <echo>MOVES and mysql have been shutdown.</echo> |
922 | 919 | </then>
|
923 | 920 | <else>
|
924 |
| - <echo>Master has been shutdown, but not MySQL since it was already running.</echo> |
| 921 | + <echo>MOVES has been shutdown, but not MySQL since it was already running.</echo> |
925 | 922 | </else>
|
926 | 923 | </if>
|
927 | 924 | </then>
|
|
931 | 928 | </if>
|
932 | 929 | </target>
|
933 | 930 |
|
934 |
| - <target name="master1worker" depends=""> |
| 931 | + <target name="main1worker" depends=""> |
935 | 932 | <delete dir="manyworkers" />
|
936 | 933 | <mkdir dir="manyworkers" />
|
937 | 934 | <mkdir dir="manyworkers/workerfolder" />
|
|
968 | 965 | <var name="didstartmysql" value="1" />
|
969 | 966 | </else>
|
970 | 967 | </if>
|
971 |
| - <echo>Launching the master, which will launch a worker...</echo> |
| 968 | + <echo>Launching MOVES, which will launch a worker...</echo> |
972 | 969 | <java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
|
973 | 970 | <sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
|
974 | 971 | <classpath refid="classpath" />
|
975 | 972 | <arg value="-workerconfig=manyworkers.txt" />
|
976 | 973 | <arg value="-r" />
|
977 | 974 | <arg value="${runspec}" />
|
978 | 975 | </java>
|
979 |
| - <echo>Master and 1 worker finished.</echo> |
| 976 | + <echo>MOVES and 1 worker finished.</echo> |
980 | 977 | <if>
|
981 | 978 | <equals arg1="${didstartmysql}" arg2="1" />
|
982 | 979 | <then>
|
|
987 | 984 | <arg value="--shutdown_timeout=30" />
|
988 | 985 | <arg value="shutdown" />
|
989 | 986 | </exec>
|
990 |
| - <echo>Master and mysql have been shutdown.</echo> |
| 987 | + <echo>MOVES and mysql have been shutdown.</echo> |
991 | 988 | </then>
|
992 | 989 | <else>
|
993 |
| - <echo>Master has been shutdown, but not MySQL since it was already running.</echo> |
| 990 | + <echo>MOVES has been shutdown, but not MySQL since it was already running.</echo> |
994 | 991 | </else>
|
995 | 992 | </if>
|
996 | 993 | </then>
|
|
1034 | 1031 | <var name="didstartmysql" value="1" />
|
1035 | 1032 | </else>
|
1036 | 1033 | </if>
|
1037 |
| - <echo>Launching the master...</echo> |
| 1034 | + <echo>Launching MOVES...</echo> |
1038 | 1035 | <java classname="gov.epa.otaq.moves.master.commandline.MOVESCommandLine" fork="yes" maxmemory="512m" spawn="false">
|
1039 | 1036 | <sysproperty key="MOVES_CONFIGURATION_FILE_NAME" value="maketodo.txt" />
|
1040 | 1037 | <classpath refid="classpath" />
|
1041 | 1038 | <arg value="-p" />
|
1042 | 1039 | <arg value="${pdspec}" />
|
1043 | 1040 | </java>
|
1044 |
| - <echo>Master finished.</echo> |
| 1041 | + <echo>MOVES finished.</echo> |
1045 | 1042 | <if>
|
1046 | 1043 | <equals arg1="${didstartmysql}" arg2="1" />
|
1047 | 1044 | <then>
|
|
1052 | 1049 | <arg value="--shutdown_timeout=30" />
|
1053 | 1050 | <arg value="shutdown" />
|
1054 | 1051 | </exec>
|
1055 |
| - <echo>Master and mysql have been shutdown.</echo> |
| 1052 | + <echo>MOVES and mysql have been shutdown.</echo> |
1056 | 1053 | </then>
|
1057 | 1054 | <else>
|
1058 |
| - <echo>Master has been shutdown, but not MySQL since it was already running.</echo> |
| 1055 | + <echo>MOVES has been shutdown, but not MySQL since it was already running.</echo> |
1059 | 1056 | </else>
|
1060 | 1057 | </if>
|
1061 | 1058 | </then>
|
|
1105 | 1102 | </jar>
|
1106 | 1103 | </target>
|
1107 | 1104 |
|
1108 |
| - <target name="convert2014_3" depends=""> |
| 1105 | + <target name="convert3_db_to_4" depends=""> |
1109 | 1106 | <java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m">
|
1110 | 1107 | <classpath>
|
1111 | 1108 | <pathelement path="${java.class.path}" />
|
1112 | 1109 | </classpath>
|
1113 | 1110 | <classpath refid="classpath" />
|
1114 | 1111 | <arg value="-input=${input}" />
|
1115 | 1112 | <arg value="-output=${output}" />
|
1116 |
| - <arg value="-script=database\ConversionScripts\Convert_MOVES2014_input_to_MOVES3.sql" /> |
1117 |
| - </java> |
1118 |
| - </target> |
1119 |
| - |
1120 |
| - <target name="convert2014ab_3" depends=""> |
1121 |
| - <java classname="gov.epa.otaq.moves.master.commandline.DatabaseConverter" fork="yes" maxmemory="512m"> |
1122 |
| - <classpath> |
1123 |
| - <pathelement path="${java.class.path}" /> |
1124 |
| - </classpath> |
1125 |
| - <classpath refid="classpath" /> |
1126 |
| - <arg value="-input=${input}" /> |
1127 |
| - <arg value="-output=${output}" /> |
1128 |
| - <arg value="-script=database\ConversionScripts\Convert_MOVES2014ab_input_to_MOVES3.sql" /> |
| 1113 | + <arg value="-script=database\ConversionScripts\Convert_MOVES3_input_to_MOVES4.sql" /> |
1129 | 1114 | </java>
|
1130 | 1115 | </target>
|
1131 | 1116 |
|
|
0 commit comments