OSDN -- 오픈 소스 소프트웨어 개발 및 다운로드
Translation Status of 한국말 translation status for ko
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

BetaProject: Commit

Mail送信先確認プログラムβプロジェクト


Commit MetaInfo

Revision606de0709c613bbbcacfe5c3462d0e2471734334 (tree)
Time2010-08-09 16:35:32
AuthorTakuya Ono <takuya-o@user...>
CommiterTakuya Ono

Log Message

Release 0.5a

NetBean version up to 6.8 from 6.0.
Chage source code repository to Git.

Change Summary

Incremental Difference

--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,7 @@
7171 <!-- Add by tkyn -->
7272 <target name="-signjar" if="signjar.storepass" >
7373 <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}" />
7575 </target>
7676 <target name="-post-jar" depends="-signjar" >
7777 <!-- tkyn
Binary files a/deploy/mdc.zip and b/deploy/mdc.zip differ
--- a/jws/mdc2.jnlp
+++ b/jws/mdc2.jnlp
@@ -2,7 +2,7 @@
22 <jnlp
33 spec="1.0+"
44 codebase="http://mdc.sourceforge.jp/jws/"
5- href="mdc2.jnlp" version="0.47" >
5+ href="mdc2.jnlp" version="0.50TB" >
66
77 <information locale="ja_JP">
88 <title>メール送信先確認プログラム</title>
@@ -34,11 +34,10 @@
3434 <update check="timeout" policy="prompt-update" />
3535
3636 <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"/>
4241 </resources>
4342
4443 <application-desc />
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -19,7 +19,14 @@ is divided into following sections:
1919 - cleanup
2020
2121 -->
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>
2330 <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
2431 <!--
2532 ======================
@@ -47,52 +54,53 @@ is divided into following sections:
4754 <property file="nbproject/project.properties"/>
4855 </target>
4956 <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>
8057 <available file="${manifest.file}" property="manifest.available"/>
81- <condition property="manifest.available+main.class">
58+ <condition property="main.class.available">
8259 <and>
83- <isset property="manifest.available"/>
8460 <isset property="main.class"/>
8561 <not>
8662 <equals arg1="${main.class}" arg2="" trim="true"/>
8763 </not>
8864 </and>
8965 </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>
9080 <condition property="manifest.available+main.class+mkdist.available">
9181 <and>
9282 <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"/>
9490 </and>
9591 </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>
96104 <condition property="have.tests">
97105 <or>
98106 <available file="${test.test.dir}"/>
@@ -127,6 +135,7 @@ is divided into following sections:
127135 <property name="javadoc.preview" value="true"/>
128136 <property name="application.args" value=""/>
129137 <property name="source.encoding" value="${file.encoding}"/>
138+ <property name="runtime.encoding" value="${source.encoding}"/>
130139 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
131140 <and>
132141 <isset property="javadoc.encoding"/>
@@ -142,12 +151,11 @@ is divided into following sections:
142151 <condition property="do.depend.true">
143152 <istrue value="${do.depend}"/>
144153 </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"/>
150157 </condition>
158+ <property name="javac.fork" value="false"/>
151159 </target>
152160 <target name="-post-init">
153161 <!-- Empty placeholder for easier customization. -->
@@ -182,14 +190,23 @@ is divided into following sections:
182190 <attribute default="${includes}" name="includes"/>
183191 <attribute default="${excludes}" name="excludes"/>
184192 <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"/>
186195 <element name="customize" optional="true"/>
187196 <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>
189205 <classpath>
190206 <path path="@{classpath}"/>
191207 </classpath>
192- <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
208+ <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
209+ <compilerarg line="${javac.compilerargs}"/>
193210 <customize/>
194211 </javac>
195212 </sequential>
@@ -228,7 +245,7 @@ is divided into following sections:
228245 <attribute default="${excludes}" name="excludes"/>
229246 <attribute default="**" name="testincludes"/>
230247 <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}">
232249 <batchtest todir="${build.test.results.dir}">
233250 <fileset dir="${test.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
234251 <filename name="@{testincludes}"/>
@@ -243,24 +260,22 @@ is divided into following sections:
243260 </syspropertyset>
244261 <formatter type="brief" usefile="false"/>
245262 <formatter type="xml"/>
263+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
246264 <jvmarg line="${run.jvmargs}"/>
247265 </junit>
248266 </sequential>
249267 </macrodef>
250268 </target>
251- <target name="-init-macrodef-nbjpda">
269+ <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
252270 <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
253271 <attribute default="${main.class}" name="name"/>
254272 <attribute default="${debug.classpath}" name="classpath"/>
255273 <attribute default="" name="stopclassname"/>
256274 <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}">
258276 <classpath>
259277 <path path="@{classpath}"/>
260278 </classpath>
261- <bootclasspath>
262- <path path="${platform.bootcp}"/>
263- </bootclasspath>
264279 </nbjpdastart>
265280 </sequential>
266281 </macrodef>
@@ -268,15 +283,15 @@ is divided into following sections:
268283 <attribute default="${build.classes.dir}" name="dir"/>
269284 <sequential>
270285 <nbjpdareload>
271- <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
286+ <fileset dir="@{dir}" includes="${fix.classes}">
287+ <include name="${fix.includes}*.class"/>
288+ </fileset>
272289 </nbjpdareload>
273290 </sequential>
274291 </macrodef>
275292 </target>
276293 <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 &quot;${ant.java.version}"/>
280295 <condition property="have-jdk-older-than-1.4">
281296 <or>
282297 <contains string="${version-output}" substring="java version &quot;1.0"/>
@@ -288,6 +303,12 @@ is divided into following sections:
288303 <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
289304 <istrue value="${have-jdk-older-than-1.4}"/>
290305 </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>
291312 </target>
292313 <target depends="-init-debug-args" name="-init-macrodef-debug">
293314 <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
@@ -295,9 +316,12 @@ is divided into following sections:
295316 <attribute default="${debug.classpath}" name="classpath"/>
296317 <element name="customize" optional="true"/>
297318 <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}"/>
299321 <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}"/>
301325 <jvmarg line="${run.jvmargs}"/>
302326 <classpath>
303327 <path path="@{classpath}"/>
@@ -314,12 +338,16 @@ is divided into following sections:
314338 <target name="-init-macrodef-java">
315339 <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
316340 <attribute default="${main.class}" name="classname"/>
341+ <attribute default="${run.classpath}" name="classpath"/>
317342 <element name="customize" optional="true"/>
318343 <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}"/>
320348 <jvmarg line="${run.jvmargs}"/>
321349 <classpath>
322- <path path="${run.classpath}"/>
350+ <path path="@{classpath}"/>
323351 </classpath>
324352 <syspropertyset>
325353 <propertyref prefix="run-sys-prop."/>
@@ -343,7 +371,29 @@ is divided into following sections:
343371 COMPILATION SECTION
344372 ===================
345373 -->
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>
347397 <target depends="init,deps-jar" name="-pre-pre-compile">
348398 <mkdir dir="${build.classes.dir}"/>
349399 </target>
@@ -352,10 +402,15 @@ is divided into following sections:
352402 <!-- You can override this target in the ../build.xml file. -->
353403 </target>
354404 <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}"/>
356411 </target>
357412 <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}"/>
359414 <copy todir="${build.classes.dir}">
360415 <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
361416 </copy>
@@ -364,7 +419,7 @@ is divided into following sections:
364419 <!-- Empty placeholder for easier customization. -->
365420 <!-- You can override this target in the ../build.xml file. -->
366421 </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"/>
368423 <target name="-pre-compile-single">
369424 <!-- Empty placeholder for easier customization. -->
370425 <!-- You can override this target in the ../build.xml file. -->
@@ -372,13 +427,13 @@ is divided into following sections:
372427 <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
373428 <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
374429 <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}"/>
376431 </target>
377432 <target name="-post-compile-single">
378433 <!-- Empty placeholder for easier customization. -->
379434 <!-- You can override this target in the ../build.xml file. -->
380435 </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"/>
382437 <!--
383438 ====================
384439 JAR BUILDING SECTION
@@ -392,10 +447,10 @@ is divided into following sections:
392447 <!-- Empty placeholder for easier customization. -->
393448 <!-- You can override this target in the ../build.xml file. -->
394449 </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">
396451 <j2seproject1:jar/>
397452 </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">
399454 <j2seproject1:jar manifest="${manifest.file}"/>
400455 </target>
401456 <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:
411466 <path path="${run.classpath}"/>
412467 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
413468 </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>
415470 </target>
416471 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
417472 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
@@ -436,13 +491,55 @@ is divided into following sections:
436491 </copylibs>
437492 <echo>To run this application from the command line without Ant, try:</echo>
438493 <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>
440537 </target>
441538 <target name="-post-jar">
442539 <!-- Empty placeholder for easier customization. -->
443540 <!-- You can override this target in the ../build.xml file. -->
444541 </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"/>
446543 <!--
447544 =================
448545 EXECUTION SECTION
@@ -458,10 +555,14 @@ is divided into following sections:
458555 <target name="-do-not-recompile">
459556 <property name="javac.includes.binary" value=""/>
460557 </target>
461- <target depends="init,-do-not-recompile,compile-single" name="run-single">
558+ <target depends="init,compile-single" name="run-single">
462559 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
463560 <j2seproject1:java classname="${run.class}"/>
464561 </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>
465566 <!--
466567 =================
467568 DEBUGGING SECTION
@@ -470,6 +571,9 @@ is divided into following sections:
470571 <target depends="init" if="netbeans.home" name="-debug-start-debugger">
471572 <j2seproject1:nbjpdastart name="${debug.class}"/>
472573 </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>
473577 <target depends="init,compile" name="-debug-start-debuggee">
474578 <j2seproject3:debug>
475579 <customize>
@@ -486,7 +590,12 @@ is divided into following sections:
486590 <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
487591 <j2seproject3:debug classname="${debug.class}"/>
488592 </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"/>
490599 <target depends="init" name="-pre-debug-fix">
491600 <fail unless="fix.includes">Must set fix.includes</fail>
492601 <property name="javac.includes" value="${fix.includes}.java"/>
@@ -502,13 +611,16 @@ is divided into following sections:
502611 -->
503612 <target depends="init" name="-javadoc-build">
504613 <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}">
506615 <classpath>
507616 <path path="${javac.classpath}"/>
508617 </classpath>
509618 <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
510619 <filename name="**/*.java"/>
511620 </fileset>
621+ <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
622+ <include name="**/*.java"/>
623+ </fileset>
512624 </javadoc>
513625 </target>
514626 <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
@@ -570,7 +682,7 @@ is divided into following sections:
570682 <j2seproject3:junit testincludes="**/*Test.java"/>
571683 </target>
572684 <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>
574686 </target>
575687 <target depends="init" if="have.tests" name="test-report"/>
576688 <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
@@ -583,9 +695,9 @@ is divided into following sections:
583695 <j2seproject3:junit excludes="" includes="${test.includes}"/>
584696 </target>
585697 <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>
587699 </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"/>
589701 <!--
590702 =======================
591703 JUNIT DEBUGGING SECTION
@@ -612,7 +724,7 @@ is divided into following sections:
612724 <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
613725 <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
614726 </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"/>
616728 <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
617729 <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
618730 </target>
@@ -649,14 +761,45 @@ is divided into following sections:
649761 CLEANUP SECTION
650762 ===============
651763 -->
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>
653780 <target depends="init" name="-do-clean">
654781 <delete dir="${build.dir}"/>
655- <delete dir="${dist.dir}"/>
782+ <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
656783 </target>
657784 <target name="-post-clean">
658785 <!-- Empty placeholder for easier customization. -->
659786 <!-- You can override this target in the ../build.xml file. -->
660787 </target>
661788 <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>
662805 </project>
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,9 +3,9 @@ build.xml.script.CRC32=1bb9c400
33 build.xml.stylesheet.CRC32=240b97a2
44 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55 # 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
99 nbproject/build-jaws-impl.xml.data.CRC32=715a224e
1010 nbproject/build-jaws-impl.xml.script.CRC32=eead23c2
1111 nbproject/build-jaws-impl.xml.stylesheet.CRC32=235a0393
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -7,6 +7,7 @@ build.classes.excludes=**/*.java,**/*.form
77 # This directory is removed when the project is cleaned:
88 build.dir=build
99 build.generated.dir=${build.dir}/generated
10+build.generated.sources.dir=${build.dir}/generated-sources
1011 # Only compile against the classpath explicitly listed here:
1112 build.sysclasspath=ignore
1213 build.test.classes.dir=${build.dir}/test/classes
@@ -21,6 +22,7 @@ dist.dir=dist
2122 dist.jar=${dist.dir}/mdc2.jar
2223 dist.javadoc.dir=${dist.dir}/javadoc
2324 dist.war=${dist.dir}/mdc2.war
25+endorsed.classpath=
2426 excludes=
2527 file.reference.BetaProject-src=test
2628 file.reference.BetaProject-test=src
@@ -58,7 +60,7 @@ jnlp.signed=false
5860 main.class=org.jent.checksmtp.ApplicationUI
5961 manifest.file=manifest.mf
6062 meta.inf.dir=${src.dir}/META-INF
61-platform.active=Java_SE_6
63+platform.active=default_platform
6264 run.classpath=\
6365 ${javac.classpath}:\
6466 ${build.classes.dir}
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -5,7 +5,6 @@
55 <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
66 <name>mdc2</name>
77 <minimum-ant-version>1.6.5</minimum-ant-version>
8- <explicit-platform explicit-source-supported="true"/>
98 <source-roots>
109 <root id="src.src.dir" name="Source Package"/>
1110 </source-roots>
--- a/src/org/jent/checksmtp/ApplicationUI.form
+++ b/src/org/jent/checksmtp/ApplicationUI.form
@@ -38,7 +38,7 @@
3838 <Component id="jButtonCancel" linkSize="1" min="-2" max="-2" attributes="0"/>
3939 <EmptySpace max="-2" attributes="0"/>
4040 </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"/>
4242 </Group>
4343 </DimensionLayout>
4444 <DimensionLayout dim="1">
@@ -91,17 +91,17 @@
9191 <Group type="102" alignment="0" attributes="0">
9292 <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
9393 <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"/>
9595 <EmptySpace max="-2" attributes="0"/>
9696 </Group>
9797 <Group type="102" alignment="1" attributes="0">
9898 <Component id="jLabel2" linkSize="2" min="-2" max="-2" attributes="0"/>
9999 <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"/>
101101 <EmptySpace min="-2" max="-2" attributes="0"/>
102102 <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
103103 <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"/>
105105 <EmptySpace min="-2" max="-2" attributes="0"/>
106106 </Group>
107107 </Group>
@@ -125,7 +125,7 @@
125125 <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
126126 <Component id="jTextFieldServerPort" alignment="3" min="-2" max="-2" attributes="0"/>
127127 </Group>
128- <EmptySpace pref="31" max="32767" attributes="0"/>
128+ <EmptySpace pref="35" max="32767" attributes="0"/>
129129 <Group type="103" groupAlignment="3" attributes="0">
130130 <Component id="jLabel7" alignment="3" min="-2" max="-2" attributes="0"/>
131131 <Component id="jTextFieldConfirmTimeout" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -273,10 +273,10 @@
273273 </Group>
274274 <EmptySpace max="-2" attributes="0"/>
275275 <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"/>
278278 <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"/>
280280 <EmptySpace max="-2" attributes="0"/>
281281 <Component id="jCheckBoxIsSjis" min="-2" max="-2" attributes="0"/>
282282 </Group>
@@ -312,7 +312,7 @@
312312 <Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
313313 <Component id="jTextFieldAttribute" alignment="3" min="-2" max="-2" attributes="0"/>
314314 </Group>
315- <EmptySpace pref="17" max="32767" attributes="0"/>
315+ <EmptySpace pref="22" max="32767" attributes="0"/>
316316 </Group>
317317 </Group>
318318 </DimensionLayout>
@@ -458,7 +458,7 @@
458458 </Group>
459459 <EmptySpace max="-2" attributes="0"/>
460460 <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"/>
462462 </Group>
463463 </Group>
464464 </DimensionLayout>
--- a/src/org/jent/checksmtp/ApplicationUI.java
+++ b/src/org/jent/checksmtp/ApplicationUI.java
@@ -623,6 +623,8 @@ public class ApplicationUI extends javax.swing.JFrame {
623623 ex.printStackTrace();
624624 } catch (ClassNotFoundException ex) {
625625 // Do not support SystemTray on this VM.
626+ } catch (NoClassDefFoundError ex) {
627+ // Do not support SystemTray on this VM.
626628 }
627629 return useSystemTray;
628630 }
--- a/src/org/jent/checksmtp/Bundle.properties
+++ b/src/org/jent/checksmtp/Bundle.properties
@@ -91,7 +91,7 @@ ApplicationUI.jButtonCancel.toolTipText=
9191
9292 ApplicationUI.jLabelProgramName.text=Mail Distination Confirm Program
9393
94-ApplicationUI.jLabelProgramVersion.text=0.5 TB
94+ApplicationUI.jLabelProgramVersion.text=0.5a TB
9595
9696 ApplicationUI.jPanelAbout.TabConstraints.tabTitle=About
9797
Show on old repository browser