1.1 --- a/task1/solution09/nbproject/build-impl.xml Sun Sep 28 14:12:38 2008 +0200
1.2 +++ b/task1/solution09/nbproject/build-impl.xml Sun Sep 28 18:23:45 2008 +0200
1.3 @@ -47,43 +47,6 @@
1.4 <property file="nbproject/project.properties"/>
1.5 </target>
1.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
1.7 - <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
1.8 - <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
1.9 - <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
1.10 - <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
1.11 - <condition property="platform.javac" value="${platform.home}/bin/javac">
1.12 - <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
1.13 - </condition>
1.14 - <property name="platform.javac" value="${platform.javac.tmp}"/>
1.15 - <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
1.16 - <condition property="platform.java" value="${platform.home}/bin/java">
1.17 - <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
1.18 - </condition>
1.19 - <property name="platform.java" value="${platform.java.tmp}"/>
1.20 - <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
1.21 - <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
1.22 - <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
1.23 - </condition>
1.24 - <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
1.25 - <condition property="platform.invalid" value="true">
1.26 - <or>
1.27 - <contains string="${platform.javac}" substring="$${platforms."/>
1.28 - <contains string="${platform.java}" substring="$${platforms."/>
1.29 - <contains string="${platform.javadoc}" substring="$${platforms."/>
1.30 - </or>
1.31 - </condition>
1.32 - <fail unless="platform.home">Must set platform.home</fail>
1.33 - <fail unless="platform.bootcp">Must set platform.bootcp</fail>
1.34 - <fail unless="platform.java">Must set platform.java</fail>
1.35 - <fail unless="platform.javac">Must set platform.javac</fail>
1.36 - <fail if="platform.invalid">
1.37 - The J2SE Platform is not correctly set up.
1.38 - Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
1.39 - Either open the project in the IDE and setup the Platform with the same name or add it manually.
1.40 - For example like this:
1.41 - ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
1.42 - or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used)
1.43 - </fail>
1.44 <available file="${manifest.file}" property="manifest.available"/>
1.45 <condition property="manifest.available+main.class">
1.46 <and>
1.47 @@ -192,7 +155,7 @@
1.48 <attribute default="" name="sourcepath"/>
1.49 <element name="customize" optional="true"/>
1.50 <sequential>
1.51 - <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}">
1.52 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
1.53 <classpath>
1.54 <path path="@{classpath}"/>
1.55 </classpath>
1.56 @@ -235,7 +198,7 @@
1.57 <attribute default="${excludes}" name="excludes"/>
1.58 <attribute default="**" name="testincludes"/>
1.59 <sequential>
1.60 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true">
1.61 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
1.62 <batchtest todir="${build.test.results.dir}">
1.63 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
1.64 <filename name="@{testincludes}"/>
1.65 @@ -265,9 +228,6 @@
1.66 <classpath>
1.67 <path path="@{classpath}"/>
1.68 </classpath>
1.69 - <bootclasspath>
1.70 - <path path="${platform.bootcp}"/>
1.71 - </bootclasspath>
1.72 </nbjpdastart>
1.73 </sequential>
1.74 </macrodef>
1.75 @@ -283,9 +243,7 @@
1.76 </macrodef>
1.77 </target>
1.78 <target name="-init-debug-args">
1.79 - <exec executable="${platform.java}" outputproperty="version-output">
1.80 - <arg value="-version"/>
1.81 - </exec>
1.82 + <property name="version-output" value="java version "${ant.java.version}"/>
1.83 <condition property="have-jdk-older-than-1.4">
1.84 <or>
1.85 <contains string="${version-output}" substring="java version "1.0"/>
1.86 @@ -310,7 +268,7 @@
1.87 <attribute default="${debug.classpath}" name="classpath"/>
1.88 <element name="customize" optional="true"/>
1.89 <sequential>
1.90 - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
1.91 + <java classname="@{classname}" dir="${work.dir}" fork="true">
1.92 <jvmarg line="${debug-args-line}"/>
1.93 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.94 <jvmarg line="${run.jvmargs}"/>
1.95 @@ -331,7 +289,7 @@
1.96 <attribute default="${main.class}" name="classname"/>
1.97 <element name="customize" optional="true"/>
1.98 <sequential>
1.99 - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
1.100 + <java classname="@{classname}" dir="${work.dir}" fork="true">
1.101 <jvmarg line="${run.jvmargs}"/>
1.102 <classpath>
1.103 <path path="${run.classpath}"/>
1.104 @@ -433,7 +391,7 @@
1.105 <path path="${run.classpath}"/>
1.106 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
1.107 </pathconvert>
1.108 - <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.109 + <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
1.110 </target>
1.111 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
1.112 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
1.113 @@ -458,7 +416,7 @@
1.114 </copylibs>
1.115 <echo>To run this application from the command line without Ant, try:</echo>
1.116 <property location="${dist.jar}" name="dist.jar.resolved"/>
1.117 - <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
1.118 + <echo>java -jar "${dist.jar.resolved}"</echo>
1.119 </target>
1.120 <target name="-post-jar">
1.121 <!-- Empty placeholder for easier customization. -->
1.122 @@ -524,7 +482,7 @@
1.123 -->
1.124 <target depends="init" name="-javadoc-build">
1.125 <mkdir dir="${dist.javadoc.dir}"/>
1.126 - <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}">
1.127 + <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}">
1.128 <classpath>
1.129 <path path="${javac.classpath}"/>
1.130 </classpath>
2.1 --- a/task1/solution09/nbproject/genfiles.properties Sun Sep 28 14:12:38 2008 +0200
2.2 +++ b/task1/solution09/nbproject/genfiles.properties Sun Sep 28 18:23:45 2008 +0200
2.3 @@ -3,6 +3,6 @@
2.4 build.xml.stylesheet.CRC32=be360661
2.5 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.6 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.7 -nbproject/build-impl.xml.data.CRC32=e8d85d23
2.8 -nbproject/build-impl.xml.script.CRC32=f0008fa7
2.9 +nbproject/build-impl.xml.data.CRC32=cab2f6f1
2.10 +nbproject/build-impl.xml.script.CRC32=711fa7d6
2.11 nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
3.1 --- a/task1/solution09/nbproject/project.properties Sun Sep 28 14:12:38 2008 +0200
3.2 +++ b/task1/solution09/nbproject/project.properties Sun Sep 28 18:23:45 2008 +0200
3.3 @@ -53,7 +53,7 @@
3.4 jnlp.offline-allowed=false
3.5 jnlp.signed=false
3.6 meta.inf.dir=${src.dir}/META-INF
3.7 -platform.active=JDK_1.6
3.8 +platform.active=default_platform
3.9 run.classpath=\
3.10 ${javac.classpath}:\
3.11 ${build.classes.dir}
4.1 --- a/task1/solution09/nbproject/project.xml Sun Sep 28 14:12:38 2008 +0200
4.2 +++ b/task1/solution09/nbproject/project.xml Sun Sep 28 18:23:45 2008 +0200
4.3 @@ -5,7 +5,6 @@
4.4 <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
4.5 <name>Currency Convertor Solution 09</name>
4.6 <minimum-ant-version>1.6.5</minimum-ant-version>
4.7 - <explicit-platform explicit-source-supported="true"/>
4.8 <source-roots>
4.9 <root id="src.dir"/>
4.10 </source-roots>
5.1 --- a/task1/solution10/nbproject/build-impl.xml Sun Sep 28 14:12:38 2008 +0200
5.2 +++ b/task1/solution10/nbproject/build-impl.xml Sun Sep 28 18:23:45 2008 +0200
5.3 @@ -47,43 +47,6 @@
5.4 <property file="nbproject/project.properties"/>
5.5 </target>
5.6 <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
5.7 - <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
5.8 - <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
5.9 - <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
5.10 - <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
5.11 - <condition property="platform.javac" value="${platform.home}/bin/javac">
5.12 - <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
5.13 - </condition>
5.14 - <property name="platform.javac" value="${platform.javac.tmp}"/>
5.15 - <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
5.16 - <condition property="platform.java" value="${platform.home}/bin/java">
5.17 - <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
5.18 - </condition>
5.19 - <property name="platform.java" value="${platform.java.tmp}"/>
5.20 - <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
5.21 - <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
5.22 - <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
5.23 - </condition>
5.24 - <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
5.25 - <condition property="platform.invalid" value="true">
5.26 - <or>
5.27 - <contains string="${platform.javac}" substring="$${platforms."/>
5.28 - <contains string="${platform.java}" substring="$${platforms."/>
5.29 - <contains string="${platform.javadoc}" substring="$${platforms."/>
5.30 - </or>
5.31 - </condition>
5.32 - <fail unless="platform.home">Must set platform.home</fail>
5.33 - <fail unless="platform.bootcp">Must set platform.bootcp</fail>
5.34 - <fail unless="platform.java">Must set platform.java</fail>
5.35 - <fail unless="platform.javac">Must set platform.javac</fail>
5.36 - <fail if="platform.invalid">
5.37 - The J2SE Platform is not correctly set up.
5.38 - Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
5.39 - Either open the project in the IDE and setup the Platform with the same name or add it manually.
5.40 - For example like this:
5.41 - ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
5.42 - or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used)
5.43 - </fail>
5.44 <available file="${manifest.file}" property="manifest.available"/>
5.45 <condition property="manifest.available+main.class">
5.46 <and>
5.47 @@ -192,7 +155,7 @@
5.48 <attribute default="" name="sourcepath"/>
5.49 <element name="customize" optional="true"/>
5.50 <sequential>
5.51 - <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}">
5.52 + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
5.53 <classpath>
5.54 <path path="@{classpath}"/>
5.55 </classpath>
5.56 @@ -235,7 +198,7 @@
5.57 <attribute default="${excludes}" name="excludes"/>
5.58 <attribute default="**" name="testincludes"/>
5.59 <sequential>
5.60 - <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true">
5.61 + <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
5.62 <batchtest todir="${build.test.results.dir}">
5.63 <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
5.64 <filename name="@{testincludes}"/>
5.65 @@ -265,9 +228,6 @@
5.66 <classpath>
5.67 <path path="@{classpath}"/>
5.68 </classpath>
5.69 - <bootclasspath>
5.70 - <path path="${platform.bootcp}"/>
5.71 - </bootclasspath>
5.72 </nbjpdastart>
5.73 </sequential>
5.74 </macrodef>
5.75 @@ -283,9 +243,7 @@
5.76 </macrodef>
5.77 </target>
5.78 <target name="-init-debug-args">
5.79 - <exec executable="${platform.java}" outputproperty="version-output">
5.80 - <arg value="-version"/>
5.81 - </exec>
5.82 + <property name="version-output" value="java version "${ant.java.version}"/>
5.83 <condition property="have-jdk-older-than-1.4">
5.84 <or>
5.85 <contains string="${version-output}" substring="java version "1.0"/>
5.86 @@ -310,7 +268,7 @@
5.87 <attribute default="${debug.classpath}" name="classpath"/>
5.88 <element name="customize" optional="true"/>
5.89 <sequential>
5.90 - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
5.91 + <java classname="@{classname}" dir="${work.dir}" fork="true">
5.92 <jvmarg line="${debug-args-line}"/>
5.93 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
5.94 <jvmarg line="${run.jvmargs}"/>
5.95 @@ -331,7 +289,7 @@
5.96 <attribute default="${main.class}" name="classname"/>
5.97 <element name="customize" optional="true"/>
5.98 <sequential>
5.99 - <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">
5.100 + <java classname="@{classname}" dir="${work.dir}" fork="true">
5.101 <jvmarg line="${run.jvmargs}"/>
5.102 <classpath>
5.103 <path path="${run.classpath}"/>
5.104 @@ -433,7 +391,7 @@
5.105 <path path="${run.classpath}"/>
5.106 <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
5.107 </pathconvert>
5.108 - <echo>${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
5.109 + <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
5.110 </target>
5.111 <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
5.112 <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
5.113 @@ -458,7 +416,7 @@
5.114 </copylibs>
5.115 <echo>To run this application from the command line without Ant, try:</echo>
5.116 <property location="${dist.jar}" name="dist.jar.resolved"/>
5.117 - <echo>${platform.java} -jar "${dist.jar.resolved}"</echo>
5.118 + <echo>java -jar "${dist.jar.resolved}"</echo>
5.119 </target>
5.120 <target name="-post-jar">
5.121 <!-- Empty placeholder for easier customization. -->
5.122 @@ -524,7 +482,7 @@
5.123 -->
5.124 <target depends="init" name="-javadoc-build">
5.125 <mkdir dir="${dist.javadoc.dir}"/>
5.126 - <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}">
5.127 + <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}">
5.128 <classpath>
5.129 <path path="${javac.classpath}"/>
5.130 </classpath>
6.1 --- a/task1/solution10/nbproject/genfiles.properties Sun Sep 28 14:12:38 2008 +0200
6.2 +++ b/task1/solution10/nbproject/genfiles.properties Sun Sep 28 18:23:45 2008 +0200
6.3 @@ -1,8 +1,8 @@
6.4 -build.xml.data.CRC32=75e20e37
6.5 +build.xml.data.CRC32=6601af03
6.6 build.xml.script.CRC32=2c84d7b2
6.7 build.xml.stylesheet.CRC32=be360661
6.8 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
6.9 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6.10 -nbproject/build-impl.xml.data.CRC32=75e20e37
6.11 -nbproject/build-impl.xml.script.CRC32=e2acc04f
6.12 +nbproject/build-impl.xml.data.CRC32=6601af03
6.13 +nbproject/build-impl.xml.script.CRC32=5e67461a
6.14 nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5
7.1 --- a/task1/solution10/nbproject/project.properties Sun Sep 28 14:12:38 2008 +0200
7.2 +++ b/task1/solution10/nbproject/project.properties Sun Sep 28 18:23:45 2008 +0200
7.3 @@ -43,7 +43,7 @@
7.4 javadoc.version=false
7.5 javadoc.windowtitle=
7.6 meta.inf.dir=${src.dir}/META-INF
7.7 -platform.active=JDK_1.6
7.8 +platform.active=default_platform
7.9 run.classpath=\
7.10 ${javac.classpath}:\
7.11 ${build.classes.dir}
8.1 --- a/task1/solution10/nbproject/project.xml Sun Sep 28 14:12:38 2008 +0200
8.2 +++ b/task1/solution10/nbproject/project.xml Sun Sep 28 18:23:45 2008 +0200
8.3 @@ -5,7 +5,6 @@
8.4 <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
8.5 <name>Currency Convertor Solution 10</name>
8.6 <minimum-ant-version>1.6.5</minimum-ant-version>
8.7 - <explicit-platform explicit-source-supported="true"/>
8.8 <source-roots>
8.9 <root id="src.dir"/>
8.10 </source-roots>