| 修訂 | 606de0709c613bbbcacfe5c3462d0e2471734334 (tree) |
|---|---|
| 時間 | 2010-08-09 16:35:32 |
| 作者 | Takuya Ono <takuya-o@user...> |
| Commiter | Takuya Ono |
Release 0.5a
NetBean version up to 6.8 from 6.0.
Chage source code repository to Git.
.cvsignore => .gitignore build.xml (diff)
deploy/mdc.zip (diff) jws/mdc2.jnlp (diff) nbproject/build-impl.xml (diff) nbproject/genfiles.properties (diff) nbproject/project.properties (diff) nbproject/project.xml (diff) nbproject/{.cvsignore => .gitignore} src/org/jent/checksmtp/ApplicationUI.form (diff)
src/org/jent/checksmtp/ApplicationUI.java (diff) src/org/jent/checksmtp/Bundle.properties (diff)| @@ -71,7 +71,7 @@ | ||
| 71 | 71 | <!-- Add by tkyn --> |
| 72 | 72 | <target name="-signjar" if="signjar.storepass" > |
| 73 | 73 | <signjar jar="${dist.jar}" alias="CodeSigning" storepass="${signjar.storepass}"/> |
| 74 | - <signjar jar="${dist.jar.dir}/lib/swing-layout-1.0.1.jar" alias="CodeSigning" storepass="${signjar.storepass}" /> | |
| 74 | + <signjar jar="${dist.jar.dir}/lib/swing-layout-1.0.4.jar" alias="CodeSigning" storepass="${signjar.storepass}" /> | |
| 75 | 75 | </target> |
| 76 | 76 | <target name="-post-jar" depends="-signjar" > |
| 77 | 77 | <!-- tkyn |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | <jnlp |
| 3 | 3 | spec="1.0+" |
| 4 | 4 | codebase="http://mdc.sourceforge.jp/jws/" |
| 5 | - href="mdc2.jnlp" version="0.47" > | |
| 5 | + href="mdc2.jnlp" version="0.50TB" > | |
| 6 | 6 | |
| 7 | 7 | <information locale="ja_JP"> |
| 8 | 8 | <title>メール送信先確認プログラム</title> |
| @@ -34,11 +34,10 @@ | ||
| 34 | 34 | <update check="timeout" policy="prompt-update" /> |
| 35 | 35 | |
| 36 | 36 | <resources> |
| 37 | - <j2se version="1.6"/> | |
| 38 | - <j2se version="1.5"/> | |
| 39 | - <j2se version="1.4"/> | |
| 40 | - <jar href="http://osdn.dl.sourceforge.jp/mdc/43769/mdc2.jar"/> | |
| 41 | - <jar href="swing-layout-1.0.3.jar"/> | |
| 37 | + <j2se version="1.6"/> | |
| 38 | + <j2se version="1.7"/> | |
| 39 | + <jar href="http://osdn.dl.sourceforge.jp/mdc/44040/mdc2.jar"/> | |
| 40 | + <jar href="swing-layout-1.0.4.jar"/> | |
| 42 | 41 | </resources> |
| 43 | 42 | |
| 44 | 43 | <application-desc /> |
| @@ -19,7 +19,14 @@ is divided into following sections: | ||
| 19 | 19 | - cleanup |
| 20 | 20 | |
| 21 | 21 | --> |
| 22 | -<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="mdc2-impl"> | |
| 22 | +<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="mdc2-impl"> | |
| 23 | + <fail message="Please build using Ant 1.7.1 or higher."> | |
| 24 | + <condition> | |
| 25 | + <not> | |
| 26 | + <antversion atleast="1.7.1"/> | |
| 27 | + </not> | |
| 28 | + </condition> | |
| 29 | + </fail> | |
| 23 | 30 | <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/> |
| 24 | 31 | <!-- |
| 25 | 32 | ====================== |
| @@ -47,52 +54,53 @@ is divided into following sections: | ||
| 47 | 54 | <property file="nbproject/project.properties"/> |
| 48 | 55 | </target> |
| 49 | 56 | <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
| 50 | - <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/> | |
| 51 | - <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> | |
| 52 | - <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> | |
| 53 | - <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> | |
| 54 | - <condition property="platform.javac" value="${platform.home}/bin/javac"> | |
| 55 | - <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> | |
| 56 | - </condition> | |
| 57 | - <property name="platform.javac" value="${platform.javac.tmp}"/> | |
| 58 | - <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> | |
| 59 | - <condition property="platform.java" value="${platform.home}/bin/java"> | |
| 60 | - <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> | |
| 61 | - </condition> | |
| 62 | - <property name="platform.java" value="${platform.java.tmp}"/> | |
| 63 | - <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> | |
| 64 | - <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> | |
| 65 | - <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> | |
| 66 | - </condition> | |
| 67 | - <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> | |
| 68 | - <condition property="platform.invalid" value="true"> | |
| 69 | - <or> | |
| 70 | - <contains string="${platform.javac}" substring="$${platforms."/> | |
| 71 | - <contains string="${platform.java}" substring="$${platforms."/> | |
| 72 | - <contains string="${platform.javadoc}" substring="$${platforms."/> | |
| 73 | - </or> | |
| 74 | - </condition> | |
| 75 | - <fail unless="platform.home">Must set platform.home</fail> | |
| 76 | - <fail unless="platform.bootcp">Must set platform.bootcp</fail> | |
| 77 | - <fail unless="platform.java">Must set platform.java</fail> | |
| 78 | - <fail unless="platform.javac">Must set platform.javac</fail> | |
| 79 | - <fail if="platform.invalid">Platform is not correctly set up</fail> | |
| 80 | 57 | <available file="${manifest.file}" property="manifest.available"/> |
| 81 | - <condition property="manifest.available+main.class"> | |
| 58 | + <condition property="main.class.available"> | |
| 82 | 59 | <and> |
| 83 | - <isset property="manifest.available"/> | |
| 84 | 60 | <isset property="main.class"/> |
| 85 | 61 | <not> |
| 86 | 62 | <equals arg1="${main.class}" arg2="" trim="true"/> |
| 87 | 63 | </not> |
| 88 | 64 | </and> |
| 89 | 65 | </condition> |
| 66 | + <condition property="manifest.available+main.class"> | |
| 67 | + <and> | |
| 68 | + <isset property="manifest.available"/> | |
| 69 | + <isset property="main.class.available"/> | |
| 70 | + </and> | |
| 71 | + </condition> | |
| 72 | + <condition property="do.mkdist"> | |
| 73 | + <and> | |
| 74 | + <isset property="libs.CopyLibs.classpath"/> | |
| 75 | + <not> | |
| 76 | + <istrue value="${mkdist.disabled}"/> | |
| 77 | + </not> | |
| 78 | + </and> | |
| 79 | + </condition> | |
| 90 | 80 | <condition property="manifest.available+main.class+mkdist.available"> |
| 91 | 81 | <and> |
| 92 | 82 | <istrue value="${manifest.available+main.class}"/> |
| 93 | - <isset property="libs.CopyLibs.classpath"/> | |
| 83 | + <isset property="do.mkdist"/> | |
| 84 | + </and> | |
| 85 | + </condition> | |
| 86 | + <condition property="manifest.available+mkdist.available"> | |
| 87 | + <and> | |
| 88 | + <istrue value="${manifest.available}"/> | |
| 89 | + <isset property="do.mkdist"/> | |
| 94 | 90 | </and> |
| 95 | 91 | </condition> |
| 92 | + <condition property="manifest.available-mkdist.available"> | |
| 93 | + <or> | |
| 94 | + <istrue value="${manifest.available}"/> | |
| 95 | + <isset property="do.mkdist"/> | |
| 96 | + </or> | |
| 97 | + </condition> | |
| 98 | + <condition property="manifest.available+main.class-mkdist.available"> | |
| 99 | + <or> | |
| 100 | + <istrue value="${manifest.available+main.class}"/> | |
| 101 | + <isset property="do.mkdist"/> | |
| 102 | + </or> | |
| 103 | + </condition> | |
| 96 | 104 | <condition property="have.tests"> |
| 97 | 105 | <or> |
| 98 | 106 | <available file="${test.test.dir}"/> |
| @@ -127,6 +135,7 @@ is divided into following sections: | ||
| 127 | 135 | <property name="javadoc.preview" value="true"/> |
| 128 | 136 | <property name="application.args" value=""/> |
| 129 | 137 | <property name="source.encoding" value="${file.encoding}"/> |
| 138 | + <property name="runtime.encoding" value="${source.encoding}"/> | |
| 130 | 139 | <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> |
| 131 | 140 | <and> |
| 132 | 141 | <isset property="javadoc.encoding"/> |
| @@ -142,12 +151,11 @@ is divided into following sections: | ||
| 142 | 151 | <condition property="do.depend.true"> |
| 143 | 152 | <istrue value="${do.depend}"/> |
| 144 | 153 | </condition> |
| 145 | - <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> | |
| 146 | - <and> | |
| 147 | - <isset property="jaxws.endorsed.dir"/> | |
| 148 | - <available file="nbproject/jaxws-build.xml"/> | |
| 149 | - </and> | |
| 154 | + <path id="endorsed.classpath.path" path="${endorsed.classpath}"/> | |
| 155 | + <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'"> | |
| 156 | + <length length="0" string="${endorsed.classpath}" when="greater"/> | |
| 150 | 157 | </condition> |
| 158 | + <property name="javac.fork" value="false"/> | |
| 151 | 159 | </target> |
| 152 | 160 | <target name="-post-init"> |
| 153 | 161 | <!-- Empty placeholder for easier customization. --> |
| @@ -182,14 +190,23 @@ is divided into following sections: | ||
| 182 | 190 | <attribute default="${includes}" name="includes"/> |
| 183 | 191 | <attribute default="${excludes}" name="excludes"/> |
| 184 | 192 | <attribute default="${javac.debug}" name="debug"/> |
| 185 | - <attribute default="" name="sourcepath"/> | |
| 193 | + <attribute default="${empty.dir}" name="sourcepath"/> | |
| 194 | + <attribute default="${empty.dir}" name="gensrcdir"/> | |
| 186 | 195 | <element name="customize" optional="true"/> |
| 187 | 196 | <sequential> |
| 188 | - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> | |
| 197 | + <property location="${build.dir}/empty" name="empty.dir"/> | |
| 198 | + <mkdir dir="${empty.dir}"/> | |
| 199 | + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> | |
| 200 | + <src> | |
| 201 | + <dirset dir="@{gensrcdir}" erroronmissingdir="false"> | |
| 202 | + <include name="*"/> | |
| 203 | + </dirset> | |
| 204 | + </src> | |
| 189 | 205 | <classpath> |
| 190 | 206 | <path path="@{classpath}"/> |
| 191 | 207 | </classpath> |
| 192 | - <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> | |
| 208 | + <compilerarg line="${endorsed.classpath.cmd.line.arg}"/> | |
| 209 | + <compilerarg line="${javac.compilerargs}"/> | |
| 193 | 210 | <customize/> |
| 194 | 211 | </javac> |
| 195 | 212 | </sequential> |
| @@ -228,7 +245,7 @@ is divided into following sections: | ||
| 228 | 245 | <attribute default="${excludes}" name="excludes"/> |
| 229 | 246 | <attribute default="**" name="testincludes"/> |
| 230 | 247 | <sequential> |
| 231 | - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true"> | |
| 248 | + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> | |
| 232 | 249 | <batchtest todir="${build.test.results.dir}"> |
| 233 | 250 | <fileset dir="${test.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
| 234 | 251 | <filename name="@{testincludes}"/> |
| @@ -243,24 +260,22 @@ is divided into following sections: | ||
| 243 | 260 | </syspropertyset> |
| 244 | 261 | <formatter type="brief" usefile="false"/> |
| 245 | 262 | <formatter type="xml"/> |
| 263 | + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> | |
| 246 | 264 | <jvmarg line="${run.jvmargs}"/> |
| 247 | 265 | </junit> |
| 248 | 266 | </sequential> |
| 249 | 267 | </macrodef> |
| 250 | 268 | </target> |
| 251 | - <target name="-init-macrodef-nbjpda"> | |
| 269 | + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> | |
| 252 | 270 | <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1"> |
| 253 | 271 | <attribute default="${main.class}" name="name"/> |
| 254 | 272 | <attribute default="${debug.classpath}" name="classpath"/> |
| 255 | 273 | <attribute default="" name="stopclassname"/> |
| 256 | 274 | <sequential> |
| 257 | - <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket"> | |
| 275 | + <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}"> | |
| 258 | 276 | <classpath> |
| 259 | 277 | <path path="@{classpath}"/> |
| 260 | 278 | </classpath> |
| 261 | - <bootclasspath> | |
| 262 | - <path path="${platform.bootcp}"/> | |
| 263 | - </bootclasspath> | |
| 264 | 279 | </nbjpdastart> |
| 265 | 280 | </sequential> |
| 266 | 281 | </macrodef> |
| @@ -268,15 +283,15 @@ is divided into following sections: | ||
| 268 | 283 | <attribute default="${build.classes.dir}" name="dir"/> |
| 269 | 284 | <sequential> |
| 270 | 285 | <nbjpdareload> |
| 271 | - <fileset dir="@{dir}" includes="${fix.includes}*.class"/> | |
| 286 | + <fileset dir="@{dir}" includes="${fix.classes}"> | |
| 287 | + <include name="${fix.includes}*.class"/> | |
| 288 | + </fileset> | |
| 272 | 289 | </nbjpdareload> |
| 273 | 290 | </sequential> |
| 274 | 291 | </macrodef> |
| 275 | 292 | </target> |
| 276 | 293 | <target name="-init-debug-args"> |
| 277 | - <exec executable="${platform.java}" outputproperty="version-output"> | |
| 278 | - <arg value="-version"/> | |
| 279 | - </exec> | |
| 294 | + <property name="version-output" value="java version "${ant.java.version}"/> | |
| 280 | 295 | <condition property="have-jdk-older-than-1.4"> |
| 281 | 296 | <or> |
| 282 | 297 | <contains string="${version-output}" substring="java version "1.0"/> |
| @@ -288,6 +303,12 @@ is divided into following sections: | ||
| 288 | 303 | <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> |
| 289 | 304 | <istrue value="${have-jdk-older-than-1.4}"/> |
| 290 | 305 | </condition> |
| 306 | + <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> | |
| 307 | + <os family="windows"/> | |
| 308 | + </condition> | |
| 309 | + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> | |
| 310 | + <isset property="debug.transport"/> | |
| 311 | + </condition> | |
| 291 | 312 | </target> |
| 292 | 313 | <target depends="-init-debug-args" name="-init-macrodef-debug"> |
| 293 | 314 | <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3"> |
| @@ -295,9 +316,12 @@ is divided into following sections: | ||
| 295 | 316 | <attribute default="${debug.classpath}" name="classpath"/> |
| 296 | 317 | <element name="customize" optional="true"/> |
| 297 | 318 | <sequential> |
| 298 | - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}"> | |
| 319 | + <java classname="@{classname}" dir="${work.dir}" fork="true"> | |
| 320 | + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> | |
| 299 | 321 | <jvmarg line="${debug-args-line}"/> |
| 300 | - <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/> | |
| 322 | + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> | |
| 323 | + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> | |
| 324 | + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> | |
| 301 | 325 | <jvmarg line="${run.jvmargs}"/> |
| 302 | 326 | <classpath> |
| 303 | 327 | <path path="@{classpath}"/> |
| @@ -314,12 +338,16 @@ is divided into following sections: | ||
| 314 | 338 | <target name="-init-macrodef-java"> |
| 315 | 339 | <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1"> |
| 316 | 340 | <attribute default="${main.class}" name="classname"/> |
| 341 | + <attribute default="${run.classpath}" name="classpath"/> | |
| 317 | 342 | <element name="customize" optional="true"/> |
| 318 | 343 | <sequential> |
| 319 | - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}"> | |
| 344 | + <java classname="@{classname}" dir="${work.dir}" fork="true"> | |
| 345 | + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> | |
| 346 | + <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> | |
| 347 | + <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/> | |
| 320 | 348 | <jvmarg line="${run.jvmargs}"/> |
| 321 | 349 | <classpath> |
| 322 | - <path path="${run.classpath}"/> | |
| 350 | + <path path="@{classpath}"/> | |
| 323 | 351 | </classpath> |
| 324 | 352 | <syspropertyset> |
| 325 | 353 | <propertyref prefix="run-sys-prop."/> |
| @@ -343,7 +371,29 @@ is divided into following sections: | ||
| 343 | 371 | COMPILATION SECTION |
| 344 | 372 | =================== |
| 345 | 373 | --> |
| 346 | - <target depends="init" name="deps-jar" unless="no.deps"/> | |
| 374 | + <target name="-deps-jar-init" unless="built-jar.properties"> | |
| 375 | + <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/> | |
| 376 | + <delete file="${built-jar.properties}" quiet="true"/> | |
| 377 | + </target> | |
| 378 | + <target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> | |
| 379 | + <echo level="warn" message="Cycle detected: mdc2 was already built"/> | |
| 380 | + </target> | |
| 381 | + <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> | |
| 382 | + <mkdir dir="${build.dir}"/> | |
| 383 | + <touch file="${built-jar.properties}" verbose="false"/> | |
| 384 | + <property file="${built-jar.properties}" prefix="already.built.jar."/> | |
| 385 | + <antcall target="-warn-already-built-jar"/> | |
| 386 | + <propertyfile file="${built-jar.properties}"> | |
| 387 | + <entry key="${basedir}" value=""/> | |
| 388 | + </propertyfile> | |
| 389 | + </target> | |
| 390 | + <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/> | |
| 391 | + <target depends="init" name="-check-automatic-build"> | |
| 392 | + <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/> | |
| 393 | + </target> | |
| 394 | + <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build"> | |
| 395 | + <antcall target="clean"/> | |
| 396 | + </target> | |
| 347 | 397 | <target depends="init,deps-jar" name="-pre-pre-compile"> |
| 348 | 398 | <mkdir dir="${build.classes.dir}"/> |
| 349 | 399 | </target> |
| @@ -352,10 +402,15 @@ is divided into following sections: | ||
| 352 | 402 | <!-- You can override this target in the ../build.xml file. --> |
| 353 | 403 | </target> |
| 354 | 404 | <target if="do.depend.true" name="-compile-depend"> |
| 355 | - <j2seproject3:depend/> | |
| 405 | + <pathconvert property="build.generated.subdirs"> | |
| 406 | + <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false"> | |
| 407 | + <include name="*"/> | |
| 408 | + </dirset> | |
| 409 | + </pathconvert> | |
| 410 | + <j2seproject3:depend srcdir="${src.src.dir}:${build.generated.subdirs}"/> | |
| 356 | 411 | </target> |
| 357 | 412 | <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile"> |
| 358 | - <j2seproject3:javac/> | |
| 413 | + <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/> | |
| 359 | 414 | <copy todir="${build.classes.dir}"> |
| 360 | 415 | <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> |
| 361 | 416 | </copy> |
| @@ -364,7 +419,7 @@ is divided into following sections: | ||
| 364 | 419 | <!-- Empty placeholder for easier customization. --> |
| 365 | 420 | <!-- You can override this target in the ../build.xml file. --> |
| 366 | 421 | </target> |
| 367 | - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> | |
| 422 | + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> | |
| 368 | 423 | <target name="-pre-compile-single"> |
| 369 | 424 | <!-- Empty placeholder for easier customization. --> |
| 370 | 425 | <!-- You can override this target in the ../build.xml file. --> |
| @@ -372,13 +427,13 @@ is divided into following sections: | ||
| 372 | 427 | <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single"> |
| 373 | 428 | <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> |
| 374 | 429 | <j2seproject3:force-recompile/> |
| 375 | - <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.src.dir}"/> | |
| 430 | + <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.src.dir}"/> | |
| 376 | 431 | </target> |
| 377 | 432 | <target name="-post-compile-single"> |
| 378 | 433 | <!-- Empty placeholder for easier customization. --> |
| 379 | 434 | <!-- You can override this target in the ../build.xml file. --> |
| 380 | 435 | </target> |
| 381 | - <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> | |
| 436 | + <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> | |
| 382 | 437 | <!-- |
| 383 | 438 | ==================== |
| 384 | 439 | JAR BUILDING SECTION |
| @@ -392,10 +447,10 @@ is divided into following sections: | ||
| 392 | 447 | <!-- Empty placeholder for easier customization. --> |
| 393 | 448 | <!-- You can override this target in the ../build.xml file. --> |
| 394 | 449 | </target> |
| 395 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available"> | |
| 450 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available"> | |
| 396 | 451 | <j2seproject1:jar/> |
| 397 | 452 | </target> |
| 398 | - <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class"> | |
| 453 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available"> | |
| 399 | 454 | <j2seproject1:jar manifest="${manifest.file}"/> |
| 400 | 455 | </target> |
| 401 | 456 | <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available"> |
| @@ -411,7 +466,7 @@ is divided into following sections: | ||
| 411 | 466 | <path path="${run.classpath}"/> |
| 412 | 467 | <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/> |
| 413 | 468 | </pathconvert> |
| 414 | - <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> | |
| 469 | + <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo> | |
| 415 | 470 | </target> |
| 416 | 471 | <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries"> |
| 417 | 472 | <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> |
| @@ -436,13 +491,55 @@ is divided into following sections: | ||
| 436 | 491 | </copylibs> |
| 437 | 492 | <echo>To run this application from the command line without Ant, try:</echo> |
| 438 | 493 | <property location="${dist.jar}" name="dist.jar.resolved"/> |
| 439 | - <echo>${platform.java} -jar "${dist.jar.resolved}"</echo> | |
| 494 | + <echo>java -jar "${dist.jar.resolved}"</echo> | |
| 495 | + </target> | |
| 496 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+mkdist.available" name="-do-jar-with-libraries-without-mainclass" unless="main.class.available"> | |
| 497 | + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
| 498 | + <pathconvert property="run.classpath.without.build.classes.dir"> | |
| 499 | + <path path="${run.classpath}"/> | |
| 500 | + <map from="${build.classes.dir.resolved}" to=""/> | |
| 501 | + </pathconvert> | |
| 502 | + <pathconvert pathsep=" " property="jar.classpath"> | |
| 503 | + <path path="${run.classpath.without.build.classes.dir}"/> | |
| 504 | + <chainedmapper> | |
| 505 | + <flattenmapper/> | |
| 506 | + <globmapper from="*" to="lib/*"/> | |
| 507 | + </chainedmapper> | |
| 508 | + </pathconvert> | |
| 509 | + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
| 510 | + <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
| 511 | + <fileset dir="${build.classes.dir}"/> | |
| 512 | + <manifest> | |
| 513 | + <attribute name="Class-Path" value="${jar.classpath}"/> | |
| 514 | + </manifest> | |
| 515 | + </copylibs> | |
| 516 | + </target> | |
| 517 | + <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.mkdist" name="-do-jar-with-libraries-without-manifest" unless="manifest.available"> | |
| 518 | + <property location="${build.classes.dir}" name="build.classes.dir.resolved"/> | |
| 519 | + <pathconvert property="run.classpath.without.build.classes.dir"> | |
| 520 | + <path path="${run.classpath}"/> | |
| 521 | + <map from="${build.classes.dir.resolved}" to=""/> | |
| 522 | + </pathconvert> | |
| 523 | + <pathconvert pathsep=" " property="jar.classpath"> | |
| 524 | + <path path="${run.classpath.without.build.classes.dir}"/> | |
| 525 | + <chainedmapper> | |
| 526 | + <flattenmapper/> | |
| 527 | + <globmapper from="*" to="lib/*"/> | |
| 528 | + </chainedmapper> | |
| 529 | + </pathconvert> | |
| 530 | + <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> | |
| 531 | + <copylibs compress="${jar.compress}" jarfile="${dist.jar}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> | |
| 532 | + <fileset dir="${build.classes.dir}"/> | |
| 533 | + <manifest> | |
| 534 | + <attribute name="Class-Path" value="${jar.classpath}"/> | |
| 535 | + </manifest> | |
| 536 | + </copylibs> | |
| 440 | 537 | </target> |
| 441 | 538 | <target name="-post-jar"> |
| 442 | 539 | <!-- Empty placeholder for easier customization. --> |
| 443 | 540 | <!-- You can override this target in the ../build.xml file. --> |
| 444 | 541 | </target> |
| 445 | - <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/> | |
| 542 | + <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-do-jar-with-libraries-without-mainclass,-do-jar-with-libraries-without-manifest,-post-jar" description="Build JAR." name="jar"/> | |
| 446 | 543 | <!-- |
| 447 | 544 | ================= |
| 448 | 545 | EXECUTION SECTION |
| @@ -458,10 +555,14 @@ is divided into following sections: | ||
| 458 | 555 | <target name="-do-not-recompile"> |
| 459 | 556 | <property name="javac.includes.binary" value=""/> |
| 460 | 557 | </target> |
| 461 | - <target depends="init,-do-not-recompile,compile-single" name="run-single"> | |
| 558 | + <target depends="init,compile-single" name="run-single"> | |
| 462 | 559 | <fail unless="run.class">Must select one file in the IDE or set run.class</fail> |
| 463 | 560 | <j2seproject1:java classname="${run.class}"/> |
| 464 | 561 | </target> |
| 562 | + <target depends="init,compile-test-single" name="run-test-with-main"> | |
| 563 | + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> | |
| 564 | + <j2seproject1:java classname="${run.class}" classpath="${run.test.classpath}"/> | |
| 565 | + </target> | |
| 465 | 566 | <!-- |
| 466 | 567 | ================= |
| 467 | 568 | DEBUGGING SECTION |
| @@ -470,6 +571,9 @@ is divided into following sections: | ||
| 470 | 571 | <target depends="init" if="netbeans.home" name="-debug-start-debugger"> |
| 471 | 572 | <j2seproject1:nbjpdastart name="${debug.class}"/> |
| 472 | 573 | </target> |
| 574 | + <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test"> | |
| 575 | + <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/> | |
| 576 | + </target> | |
| 473 | 577 | <target depends="init,compile" name="-debug-start-debuggee"> |
| 474 | 578 | <j2seproject3:debug> |
| 475 | 579 | <customize> |
| @@ -486,7 +590,12 @@ is divided into following sections: | ||
| 486 | 590 | <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> |
| 487 | 591 | <j2seproject3:debug classname="${debug.class}"/> |
| 488 | 592 | </target> |
| 489 | - <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> | |
| 593 | + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/> | |
| 594 | + <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test"> | |
| 595 | + <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail> | |
| 596 | + <j2seproject3:debug classname="${debug.class}" classpath="${debug.test.classpath}"/> | |
| 597 | + </target> | |
| 598 | + <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/> | |
| 490 | 599 | <target depends="init" name="-pre-debug-fix"> |
| 491 | 600 | <fail unless="fix.includes">Must set fix.includes</fail> |
| 492 | 601 | <property name="javac.includes" value="${fix.includes}.java"/> |
| @@ -502,13 +611,16 @@ is divided into following sections: | ||
| 502 | 611 | --> |
| 503 | 612 | <target depends="init" name="-javadoc-build"> |
| 504 | 613 | <mkdir dir="${dist.javadoc.dir}"/> |
| 505 | - <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> | |
| 614 | + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> | |
| 506 | 615 | <classpath> |
| 507 | 616 | <path path="${javac.classpath}"/> |
| 508 | 617 | </classpath> |
| 509 | 618 | <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}"> |
| 510 | 619 | <filename name="**/*.java"/> |
| 511 | 620 | </fileset> |
| 621 | + <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> | |
| 622 | + <include name="**/*.java"/> | |
| 623 | + </fileset> | |
| 512 | 624 | </javadoc> |
| 513 | 625 | </target> |
| 514 | 626 | <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview"> |
| @@ -570,7 +682,7 @@ is divided into following sections: | ||
| 570 | 682 | <j2seproject3:junit testincludes="**/*Test.java"/> |
| 571 | 683 | </target> |
| 572 | 684 | <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> |
| 573 | - <fail if="tests.failed">Some tests failed; see details above.</fail> | |
| 685 | + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> | |
| 574 | 686 | </target> |
| 575 | 687 | <target depends="init" if="have.tests" name="test-report"/> |
| 576 | 688 | <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> |
| @@ -583,9 +695,9 @@ is divided into following sections: | ||
| 583 | 695 | <j2seproject3:junit excludes="" includes="${test.includes}"/> |
| 584 | 696 | </target> |
| 585 | 697 | <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> |
| 586 | - <fail if="tests.failed">Some tests failed; see details above.</fail> | |
| 698 | + <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail> | |
| 587 | 699 | </target> |
| 588 | - <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> | |
| 700 | + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> | |
| 589 | 701 | <!-- |
| 590 | 702 | ======================= |
| 591 | 703 | JUNIT DEBUGGING SECTION |
| @@ -612,7 +724,7 @@ is divided into following sections: | ||
| 612 | 724 | <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> |
| 613 | 725 | <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> |
| 614 | 726 | </target> |
| 615 | - <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> | |
| 727 | + <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> | |
| 616 | 728 | <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> |
| 617 | 729 | <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/> |
| 618 | 730 | </target> |
| @@ -649,14 +761,45 @@ is divided into following sections: | ||
| 649 | 761 | CLEANUP SECTION |
| 650 | 762 | =============== |
| 651 | 763 | --> |
| 652 | - <target depends="init" name="deps-clean" unless="no.deps"/> | |
| 764 | + <target name="-deps-clean-init" unless="built-clean.properties"> | |
| 765 | + <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/> | |
| 766 | + <delete file="${built-clean.properties}" quiet="true"/> | |
| 767 | + </target> | |
| 768 | + <target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> | |
| 769 | + <echo level="warn" message="Cycle detected: mdc2 was already built"/> | |
| 770 | + </target> | |
| 771 | + <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> | |
| 772 | + <mkdir dir="${build.dir}"/> | |
| 773 | + <touch file="${built-clean.properties}" verbose="false"/> | |
| 774 | + <property file="${built-clean.properties}" prefix="already.built.clean."/> | |
| 775 | + <antcall target="-warn-already-built-clean"/> | |
| 776 | + <propertyfile file="${built-clean.properties}"> | |
| 777 | + <entry key="${basedir}" value=""/> | |
| 778 | + </propertyfile> | |
| 779 | + </target> | |
| 653 | 780 | <target depends="init" name="-do-clean"> |
| 654 | 781 | <delete dir="${build.dir}"/> |
| 655 | - <delete dir="${dist.dir}"/> | |
| 782 | + <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/> | |
| 656 | 783 | </target> |
| 657 | 784 | <target name="-post-clean"> |
| 658 | 785 | <!-- Empty placeholder for easier customization. --> |
| 659 | 786 | <!-- You can override this target in the ../build.xml file. --> |
| 660 | 787 | </target> |
| 661 | 788 | <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> |
| 789 | + <target name="-check-call-dep"> | |
| 790 | + <property file="${call.built.properties}" prefix="already.built."/> | |
| 791 | + <condition property="should.call.dep"> | |
| 792 | + <not> | |
| 793 | + <isset property="already.built.${call.subproject}"/> | |
| 794 | + </not> | |
| 795 | + </condition> | |
| 796 | + </target> | |
| 797 | + <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep"> | |
| 798 | + <ant antfile="${call.script}" inheritall="false" target="${call.target}"> | |
| 799 | + <propertyset> | |
| 800 | + <propertyref prefix="transfer."/> | |
| 801 | + <mapper from="transfer.*" to="*" type="glob"/> | |
| 802 | + </propertyset> | |
| 803 | + </ant> | |
| 804 | + </target> | |
| 662 | 805 | </project> |
| @@ -3,9 +3,9 @@ build.xml.script.CRC32=1bb9c400 | ||
| 3 | 3 | build.xml.stylesheet.CRC32=240b97a2 |
| 4 | 4 | # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. |
| 5 | 5 | # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. |
| 6 | -nbproject/build-impl.xml.data.CRC32=ff1220a2 | |
| 7 | -nbproject/build-impl.xml.script.CRC32=d4d6fc37 | |
| 8 | -nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08 | |
| 6 | +nbproject/build-impl.xml.data.CRC32=715a224e | |
| 7 | +nbproject/build-impl.xml.script.CRC32=f7663e1f | |
| 8 | +nbproject/build-impl.xml.stylesheet.CRC32=576378a2@1.32.1.45 | |
| 9 | 9 | nbproject/build-jaws-impl.xml.data.CRC32=715a224e |
| 10 | 10 | nbproject/build-jaws-impl.xml.script.CRC32=eead23c2 |
| 11 | 11 | nbproject/build-jaws-impl.xml.stylesheet.CRC32=235a0393 |
| @@ -7,6 +7,7 @@ build.classes.excludes=**/*.java,**/*.form | ||
| 7 | 7 | # This directory is removed when the project is cleaned: |
| 8 | 8 | build.dir=build |
| 9 | 9 | build.generated.dir=${build.dir}/generated |
| 10 | +build.generated.sources.dir=${build.dir}/generated-sources | |
| 10 | 11 | # Only compile against the classpath explicitly listed here: |
| 11 | 12 | build.sysclasspath=ignore |
| 12 | 13 | build.test.classes.dir=${build.dir}/test/classes |
| @@ -21,6 +22,7 @@ dist.dir=dist | ||
| 21 | 22 | dist.jar=${dist.dir}/mdc2.jar |
| 22 | 23 | dist.javadoc.dir=${dist.dir}/javadoc |
| 23 | 24 | dist.war=${dist.dir}/mdc2.war |
| 25 | +endorsed.classpath= | |
| 24 | 26 | excludes= |
| 25 | 27 | file.reference.BetaProject-src=test |
| 26 | 28 | file.reference.BetaProject-test=src |
| @@ -58,7 +60,7 @@ jnlp.signed=false | ||
| 58 | 60 | main.class=org.jent.checksmtp.ApplicationUI |
| 59 | 61 | manifest.file=manifest.mf |
| 60 | 62 | meta.inf.dir=${src.dir}/META-INF |
| 61 | -platform.active=Java_SE_6 | |
| 63 | +platform.active=default_platform | |
| 62 | 64 | run.classpath=\ |
| 63 | 65 | ${javac.classpath}:\ |
| 64 | 66 | ${build.classes.dir} |
| @@ -5,7 +5,6 @@ | ||
| 5 | 5 | <data xmlns="http://www.netbeans.org/ns/j2se-project/3"> |
| 6 | 6 | <name>mdc2</name> |
| 7 | 7 | <minimum-ant-version>1.6.5</minimum-ant-version> |
| 8 | - <explicit-platform explicit-source-supported="true"/> | |
| 9 | 8 | <source-roots> |
| 10 | 9 | <root id="src.src.dir" name="Source Package"/> |
| 11 | 10 | </source-roots> |
| @@ -38,7 +38,7 @@ | ||
| 38 | 38 | <Component id="jButtonCancel" linkSize="1" min="-2" max="-2" attributes="0"/> |
| 39 | 39 | <EmptySpace max="-2" attributes="0"/> |
| 40 | 40 | </Group> |
| 41 | - <Component id="jTabbedPane" alignment="0" pref="388" max="32767" attributes="0"/> | |
| 41 | + <Component id="jTabbedPane" alignment="0" pref="394" max="32767" attributes="0"/> | |
| 42 | 42 | </Group> |
| 43 | 43 | </DimensionLayout> |
| 44 | 44 | <DimensionLayout dim="1"> |
| @@ -91,17 +91,17 @@ | ||
| 91 | 91 | <Group type="102" alignment="0" attributes="0"> |
| 92 | 92 | <Component id="jLabel7" min="-2" max="-2" attributes="0"/> |
| 93 | 93 | <EmptySpace max="-2" attributes="0"/> |
| 94 | - <Component id="jTextFieldConfirmTimeout" pref="265" max="32767" attributes="0"/> | |
| 94 | + <Component id="jTextFieldConfirmTimeout" pref="266" max="32767" attributes="0"/> | |
| 95 | 95 | <EmptySpace max="-2" attributes="0"/> |
| 96 | 96 | </Group> |
| 97 | 97 | <Group type="102" alignment="1" attributes="0"> |
| 98 | 98 | <Component id="jLabel2" linkSize="2" min="-2" max="-2" attributes="0"/> |
| 99 | 99 | <EmptySpace min="-2" max="-2" attributes="0"/> |
| 100 | - <Component id="jTextFieldServerHost" pref="155" max="32767" attributes="0"/> | |
| 100 | + <Component id="jTextFieldServerHost" pref="154" max="32767" attributes="0"/> | |
| 101 | 101 | <EmptySpace min="-2" max="-2" attributes="0"/> |
| 102 | 102 | <Component id="jLabel3" min="-2" max="-2" attributes="0"/> |
| 103 | 103 | <EmptySpace min="-2" max="-2" attributes="0"/> |
| 104 | - <Component id="jTextFieldServerPort" pref="82" max="32767" attributes="0"/> | |
| 104 | + <Component id="jTextFieldServerPort" pref="81" max="32767" attributes="0"/> | |
| 105 | 105 | <EmptySpace min="-2" max="-2" attributes="0"/> |
| 106 | 106 | </Group> |
| 107 | 107 | </Group> |
| @@ -125,7 +125,7 @@ | ||
| 125 | 125 | <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/> |
| 126 | 126 | <Component id="jTextFieldServerPort" alignment="3" min="-2" max="-2" attributes="0"/> |
| 127 | 127 | </Group> |
| 128 | - <EmptySpace pref="31" max="32767" attributes="0"/> | |
| 128 | + <EmptySpace pref="35" max="32767" attributes="0"/> | |
| 129 | 129 | <Group type="103" groupAlignment="3" attributes="0"> |
| 130 | 130 | <Component id="jLabel7" alignment="3" min="-2" max="-2" attributes="0"/> |
| 131 | 131 | <Component id="jTextFieldConfirmTimeout" alignment="3" min="-2" max="-2" attributes="0"/> |
| @@ -273,10 +273,10 @@ | ||
| 273 | 273 | </Group> |
| 274 | 274 | <EmptySpace max="-2" attributes="0"/> |
| 275 | 275 | <Group type="103" groupAlignment="0" attributes="0"> |
| 276 | - <Component id="jTextFieldAttribute" alignment="0" pref="296" max="32767" attributes="0"/> | |
| 277 | - <Component id="jTextFieldBaseDn" pref="296" max="32767" attributes="0"/> | |
| 276 | + <Component id="jTextFieldAttribute" alignment="0" pref="301" max="32767" attributes="0"/> | |
| 277 | + <Component id="jTextFieldBaseDn" pref="301" max="32767" attributes="0"/> | |
| 278 | 278 | <Group type="102" alignment="0" attributes="0"> |
| 279 | - <Component id="jTextFieldProviderUrl" pref="222" max="32767" attributes="0"/> | |
| 279 | + <Component id="jTextFieldProviderUrl" pref="221" max="32767" attributes="0"/> | |
| 280 | 280 | <EmptySpace max="-2" attributes="0"/> |
| 281 | 281 | <Component id="jCheckBoxIsSjis" min="-2" max="-2" attributes="0"/> |
| 282 | 282 | </Group> |
| @@ -312,7 +312,7 @@ | ||
| 312 | 312 | <Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/> |
| 313 | 313 | <Component id="jTextFieldAttribute" alignment="3" min="-2" max="-2" attributes="0"/> |
| 314 | 314 | </Group> |
| 315 | - <EmptySpace pref="17" max="32767" attributes="0"/> | |
| 315 | + <EmptySpace pref="22" max="32767" attributes="0"/> | |
| 316 | 316 | </Group> |
| 317 | 317 | </Group> |
| 318 | 318 | </DimensionLayout> |
| @@ -458,7 +458,7 @@ | ||
| 458 | 458 | </Group> |
| 459 | 459 | <EmptySpace max="-2" attributes="0"/> |
| 460 | 460 | <Component id="jLabelSfURL" min="-2" max="-2" attributes="0"/> |
| 461 | - <EmptySpace pref="58" max="32767" attributes="0"/> | |
| 461 | + <EmptySpace pref="60" max="32767" attributes="0"/> | |
| 462 | 462 | </Group> |
| 463 | 463 | </Group> |
| 464 | 464 | </DimensionLayout> |
| @@ -623,6 +623,8 @@ public class ApplicationUI extends javax.swing.JFrame { | ||
| 623 | 623 | ex.printStackTrace(); |
| 624 | 624 | } catch (ClassNotFoundException ex) { |
| 625 | 625 | // Do not support SystemTray on this VM. |
| 626 | + } catch (NoClassDefFoundError ex) { | |
| 627 | + // Do not support SystemTray on this VM. | |
| 626 | 628 | } |
| 627 | 629 | return useSystemTray; |
| 628 | 630 | } |
| @@ -91,7 +91,7 @@ ApplicationUI.jButtonCancel.toolTipText= | ||
| 91 | 91 | |
| 92 | 92 | ApplicationUI.jLabelProgramName.text=Mail Distination Confirm Program |
| 93 | 93 | |
| 94 | -ApplicationUI.jLabelProgramVersion.text=0.5 TB | |
| 94 | +ApplicationUI.jLabelProgramVersion.text=0.5a TB | |
| 95 | 95 | |
| 96 | 96 | ApplicationUI.jPanelAbout.TabConstraints.tabTitle=About |
| 97 | 97 |
Fork