Ignore:
Timestamp:
10/15/2019 01:26:20 PM (7 years ago)
Author:
jdalbey
Message:

PizzaOrderIntl? change project properties to jdk 1.8

Location:
branches/SVNtutorial/PizzaOrderIntl
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/SVNtutorial/PizzaOrderIntl

    • Property svn:ignore set to
      build

  • branches/SVNtutorial/PizzaOrderIntl/nbproject

    • Property svn:ignore set to
      private

  • branches/SVNtutorial/PizzaOrderIntl/nbproject/build-impl.xml

    r481 r482  
    4747        <!-- The two properties below are usually overridden --> 
    4848        <!-- by the active platform. Just a fallback. --> 
    49         <property name="default.javac.source" value="1.4"/> 
    50         <property name="default.javac.target" value="1.4"/> 
     49        <property name="default.javac.source" value="1.6"/> 
     50        <property name="default.javac.target" value="1.6"/> 
    5151    </target> 
    5252    <target depends="-pre-init,-init-private,-init-user" name="-init-project"> 
    … …  
    5555    </target> 
    5656    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> 
    57         <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/> 
    58         <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> 
    59         <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> 
    60         <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> 
    61         <condition property="platform.javac" value="${platform.home}/bin/javac"> 
    62             <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> 
    63         </condition> 
    64         <property name="platform.javac" value="${platform.javac.tmp}"/> 
    65         <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> 
    66         <condition property="platform.java" value="${platform.home}/bin/java"> 
    67             <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> 
    68         </condition> 
    69         <property name="platform.java" value="${platform.java.tmp}"/> 
    70         <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> 
    71         <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> 
    72             <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> 
    73         </condition> 
    74         <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> 
    75         <condition property="platform.invalid" value="true"> 
    76             <or> 
    77                 <contains string="${platform.javac}" substring="$${platforms."/> 
    78                 <contains string="${platform.java}" substring="$${platforms."/> 
    79                 <contains string="${platform.javadoc}" substring="$${platforms."/> 
    80             </or> 
    81         </condition> 
    82         <fail unless="platform.home">Must set platform.home</fail> 
    83         <fail unless="platform.bootcp">Must set platform.bootcp</fail> 
    84         <fail unless="platform.java">Must set platform.java</fail> 
    85         <fail unless="platform.javac">Must set platform.javac</fail> 
    86         <fail if="platform.invalid"> 
    87  The J2SE Platform is not correctly set up. 
    88  Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.  
    89  Either open the project in the IDE and setup the Platform with the same name or add it manually. 
    90  For example like this: 
    91      ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file) 
    92   or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used)  
    93   </fail> 
     57        <property name="platform.java" value="${java.home}/bin/java"/> 
    9458        <available file="${manifest.file}" property="manifest.available"/> 
    9559        <condition property="splashscreen.available"> 
    … …  
    11377                <isset property="javac.profile"/> 
    11478                <length length="0" string="${javac.profile}" when="greater"/> 
    115                 <matches pattern="1\.[89](\..*)?" string="${javac.source}"/> 
     79                <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/> 
    11680            </and> 
    11781        </condition> 
    11882        <condition property="do.archive"> 
    119             <not> 
    120                 <istrue value="${jar.archive.disabled}"/> 
    121             </not> 
     83            <or> 
     84                <not> 
     85                    <istrue value="${jar.archive.disabled}"/> 
     86                </not> 
     87                <istrue value="${not.archive.disabled}"/> 
     88            </or> 
    12289        </condition> 
    12390        <condition property="do.mkdist"> 
    … …  
    190157        <property name="source.encoding" value="${file.encoding}"/> 
    191158        <property name="runtime.encoding" value="${source.encoding}"/> 
     159        <property name="manifest.encoding" value="${source.encoding}"/> 
    192160        <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> 
    193161            <and> 
    … …  
    216184        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}"> 
    217185            <isset property="profile.available"/> 
     186        </condition> 
     187        <condition else="false" property="jdkBug6558476"> 
     188            <and> 
     189                <matches pattern="1\.[56]" string="${java.specification.version}"/> 
     190                <not> 
     191                    <os family="unix"/> 
     192                </not> 
     193            </and> 
     194        </condition> 
     195        <condition else="false" property="javac.fork"> 
     196            <or> 
     197                <istrue value="${jdkBug6558476}"/> 
     198                <istrue value="${javac.external.vm}"/> 
     199            </or> 
    218200        </condition> 
    219201        <property name="jar.index" value="false"/> 
    … …  
    242224            <istrue value="${junit+testng.available}"/> 
    243225        </condition> 
     226        <property name="java.failonerror" value="true"/> 
    244227    </target> 
    245228    <target name="-post-init"> 
    … …  
    285268                <mkdir dir="${empty.dir}"/> 
    286269                <mkdir dir="@{apgeneratedsrcdir}"/> 
    287                 <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}"> 
     270                <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}"> 
    288271                    <src> 
    289272                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
    … …  
    325308                <property location="${build.dir}/empty" name="empty.dir"/> 
    326309                <mkdir dir="${empty.dir}"/> 
    327                 <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}"> 
     310                <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}"> 
    328311                    <src> 
    329312                        <dirset dir="@{gensrcdir}" erroronmissingdir="false"> 
    … …  
    406389            <sequential> 
    407390                <property name="junit.forkmode" value="perTest"/> 
    408                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 
     391                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 
    409392                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
    410393                    <syspropertyset> 
    … …  
    429412            <sequential> 
    430413                <property name="junit.forkmode" value="perTest"/> 
    431                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 
     414                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 
    432415                    <batchtest todir="${build.test.results.dir}"> 
    433416                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    … …  
    468451                </union> 
    469452                <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> 
    470                 <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="PizzaOrderIntl" testname="TestNG tests" workingDir="${work.dir}"> 
     453                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="PizzaOrderIntl" testname="TestNG tests" workingDir="${work.dir}"> 
    471454                    <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> 
    472455                    <propertyset> 
    … …  
    548531            <sequential> 
    549532                <property name="junit.forkmode" value="perTest"/> 
    550                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 
     533                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 
    551534                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> 
    552535                    <syspropertyset> 
    … …  
    573556            <sequential> 
    574557                <property name="junit.forkmode" value="perTest"/> 
    575                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> 
     558                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}"> 
    576559                    <batchtest todir="${build.test.results.dir}"> 
    577560                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> 
    … …  
    718701                <property environment="env"/> 
    719702                <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> 
    720                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> 
     703                <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}"> 
    721704                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    722705                    <jvmarg value="${profiler.info.jvmargs.agent}"/> 
    … …  
    753736                        <path path="@{classpath}"/> 
    754737                    </classpath> 
    755                     <bootclasspath> 
    756                         <path path="${platform.bootcp}"/> 
    757                     </bootclasspath> 
    758738                </nbjpdastart> 
    759739            </sequential> 
    … …  
    771751    </target> 
    772752    <target name="-init-debug-args"> 
    773         <exec executable="${platform.java}" outputproperty="version-output"> 
    774             <arg value="-version"/> 
    775         </exec> 
     753        <property name="version-output" value="java version &quot;${ant.java.version}"/> 
    776754        <condition property="have-jdk-older-than-1.4"> 
    777755            <or> 
    … …  
    798776            <element name="customize" optional="true"/> 
    799777            <sequential> 
    800                 <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}"> 
     778                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    801779                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    802780                    <jvmarg line="${debug-args-line}"/> 
    … …  
    825803            <element name="customize" optional="true"/> 
    826804            <sequential> 
    827                 <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}"> 
     805                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true"> 
    828806                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> 
    829807                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/> 
    … …  
    864842                </pathconvert> 
    865843                <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> 
    866                 <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
     844                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> 
    867845                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    868846                    <manifest> 
    … …  
    876854    <target name="-init-presetdef-jar"> 
    877855        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1"> 
    878             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}"> 
     856            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8"> 
    879857                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/> 
    880858            </jar> 
    … …  
    999977    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest"> 
    1000978        <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/> 
    1001         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/> 
     979        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/> 
    1002980    </target> 
    1003981    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass"> 
    1004         <manifest file="${tmp.manifest.file}" mode="update"> 
     982        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    1005983            <attribute name="Main-Class" value="${main.class}"/> 
    1006984        </manifest> 
    1007985    </target> 
    1008986    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile"> 
    1009         <manifest file="${tmp.manifest.file}" mode="update"> 
     987        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    1010988            <attribute name="Profile" value="${javac.profile}"/> 
    1011989        </manifest> 
    … …  
    1015993        <mkdir dir="${build.classes.dir}/META-INF"/> 
    1016994        <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/> 
    1017         <manifest file="${tmp.manifest.file}" mode="update"> 
     995        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update"> 
    1018996            <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/> 
    1019997        </manifest> 
    … …  
    10231001        <echo level="info">To run this application from the command line without Ant, try:</echo> 
    10241002        <property location="${dist.jar}" name="dist.jar.resolved"/> 
    1025         <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo> 
     1003        <echo level="info">java -jar "${dist.jar.resolved}"</echo> 
    10261004    </target> 
    10271005    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist"> 
    … …  
    12101188        <fail unless="run.class">Must select one file in the IDE or set run.class</fail> 
    12111189        <startprofiler/> 
    1212         <antcal target="run-test-with-main"/> 
     1190        <antcall target="run-test-with-main"/> 
    12131191    </target> 
    12141192    <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent"> 
    … …  
    12321210            </and> 
    12331211        </condition> 
    1234         <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}"> 
     1212        <condition else="" property="bug5101868workaround" value="*.java"> 
     1213            <matches pattern="1\.[56](\..*)?" string="${java.version}"/> 
     1214        </condition> 
     1215        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${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}"> 
    12351216            <classpath> 
    12361217                <path path="${javac.classpath}"/> 
    12371218            </classpath> 
    1238             <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}"> 
     1219            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}"> 
    12391220                <filename name="**/*.java"/> 
    12401221            </fileset> 
    … …  
    13101291    </target> 
    13111292    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> 
    1312         <j2seproject3:test testincludes="**/*Test.java"/> 
     1293        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/> 
    13131294    </target> 
    13141295    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> 
Note: See TracChangeset for help on using the changeset viewer.