(no commit message)

diff --git a/fluidbook/tools/fwstk/nbproject/build-impl.xml b/fluidbook/tools/fwstk/nbproject/build-impl.xml
index ba8fe7e7e5e44c77e45bc7584008eb6121912d6c..e0ac685fb6800f33c5c90589ea5efb5e1626b010 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/build-impl.xml
+++ b/fluidbook/tools/fwstk/nbproject/build-impl.xml
@@ -54,43 +54,6 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>\r
     </target>\r
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
-        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
-        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
-        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
-        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
-        <condition property="platform.javac" value="${platform.home}/bin/javac">\r
-            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
-        </condition>\r
-        <property name="platform.javac" value="${platform.javac.tmp}"/>\r
-        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
-        <condition property="platform.java" value="${platform.home}/bin/java">\r
-            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
-        </condition>\r
-        <property name="platform.java" value="${platform.java.tmp}"/>\r
-        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
-        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
-            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
-        </condition>\r
-        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
-        <condition property="platform.invalid" value="true">\r
-            <or>\r
-                <contains string="${platform.javac}" substring="$${platforms."/>\r
-                <contains string="${platform.java}" substring="$${platforms."/>\r
-                <contains string="${platform.javadoc}" substring="$${platforms."/>\r
-            </or>\r
-        </condition>\r
-        <fail unless="platform.home">Must set platform.home</fail>\r
-        <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
-        <fail unless="platform.java">Must set platform.java</fail>\r
-        <fail unless="platform.javac">Must set platform.javac</fail>\r
-        <fail if="platform.invalid">\r
- The J2SE Platform is not correctly set up.\r
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
- Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
- For example like this:\r
-     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
-  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) \r
-  </fail>\r
         <available file="${manifest.file}" property="manifest.available"/>\r
         <condition property="splashscreen.available">\r
             <and>\r
@@ -222,6 +185,15 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
             <length length="0" string="${endorsed.classpath}" when="greater"/>\r
         </condition>\r
+        <condition else="false" property="jdkBug6558476">\r
+            <and>\r
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
+                <not>\r
+                    <os family="unix"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <property name="javac.fork" value="${jdkBug6558476}"/>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
@@ -267,7 +239,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
                 <mkdir dir="@{apgeneratedsrcdir}"/>\r
-                <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}">\r
+                <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}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -306,7 +278,7 @@ is divided into following sections:
             <sequential>\r
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
-                <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}">\r
+                <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}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -363,7 +335,7 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
                     <batchtest todir="${build.test.results.dir}"/>\r
                     <classpath>\r
                         <path path="${run.test.classpath}"/>\r
@@ -435,9 +407,6 @@ is divided into following sections:
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
-                    <bootclasspath>\r
-                        <path path="${platform.bootcp}"/>\r
-                    </bootclasspath>\r
                 </nbjpdastart>\r
             </sequential>\r
         </macrodef>\r
@@ -453,9 +422,7 @@ is divided into following sections:
         </macrodef>\r
     </target>\r
     <target name="-init-debug-args">\r
-        <exec executable="${platform.java}" outputproperty="version-output">\r
-            <arg value="-version"/>\r
-        </exec>\r
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
         <condition property="have-jdk-older-than-1.4">\r
             <or>\r
                 <contains string="${version-output}" substring="java version &quot;1.0"/>\r
@@ -480,7 +447,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg line="${debug-args-line}"/>\r
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
@@ -505,7 +472,7 @@ is divided into following sections:
             <attribute default="${run.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
@@ -688,7 +655,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>\r
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
         </pathconvert>\r
-        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
     </target>\r
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">\r
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
@@ -715,7 +682,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
         <echo level="info">To run this application from the command line without Ant, try:</echo>\r
         <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>\r
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
     </target>\r
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">\r
         <delete>\r
@@ -865,15 +832,16 @@ is divided into following sections:
             -->\r
     <target depends="init" if="have.sources" name="-javadoc-build">\r
         <mkdir dir="${dist.javadoc.dir}"/>\r
-        <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}">\r
+        <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}">\r
             <classpath>\r
                 <path path="${javac.classpath}"/>\r
             </classpath>\r
-            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">\r
+            <fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">\r
                 <filename name="**/*.java"/>\r
             </fileset>\r
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">\r
                 <include name="**/*.java"/>\r
+                <exclude name="*.java"/>\r
             </fileset>\r
         </javadoc>\r
         <copy todir="${dist.javadoc.dir}">\r

diff --git a/fluidbook/tools/fwstk/nbproject/genfiles.properties b/fluidbook/tools/fwstk/nbproject/genfiles.properties
index c18a0bf72cbba98a8d9ea15560736172f02ef233..00af3e9f51cd07dd8e94266e641db7e69f2e7061 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/genfiles.properties
+++ b/fluidbook/tools/fwstk/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0fe54e23\r
+build.xml.data.CRC32=5afba316\r
 build.xml.script.CRC32=ef618d2d\r
-build.xml.stylesheet.CRC32=28e38971@1.43.1.45\r
+build.xml.stylesheet.CRC32=28e38971@1.44.1.45\r
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
-nbproject/build-impl.xml.data.CRC32=0fe54e23\r
-nbproject/build-impl.xml.script.CRC32=34b388b3\r
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45\r
+nbproject/build-impl.xml.data.CRC32=5afba316\r
+nbproject/build-impl.xml.script.CRC32=f0904f14\r
+nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.properties b/fluidbook/tools/fwstk/nbproject/project.properties
index 2bb20f19cead100858b11c6d2a32efc408c09766..e1d9e82f1d2a10e18975226fe1f02854848a50e3 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.properties
+++ b/fluidbook/tools/fwstk/nbproject/project.properties
@@ -85,7 +85,7 @@ main.class=com.fluidbook.fwstk.Main
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
 mkdist.disabled=false\r
-platform.active=JDK_1.7\r
+platform.active=default_platform\r
 run.classpath=\\r
     ${build.classes.dir}:\\r
     ${javac.classpath}\r

diff --git a/fluidbook/tools/fwstk/nbproject/project.xml b/fluidbook/tools/fwstk/nbproject/project.xml
index 38eb6a1e35c4121bb8fcb1ab0c5af13aa69e7610..a70a3bf29431378f33d371fe067865f62a63519c 100644 (file)
--- a/fluidbook/tools/fwstk/nbproject/project.xml
+++ b/fluidbook/tools/fwstk/nbproject/project.xml
@@ -4,7 +4,6 @@
     <configuration>\r
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">\r
             <name>fwstk</name>\r
-            <explicit-platform explicit-source-supported="true"/>\r
             <source-roots>\r
                 <root id="src.src.dir"/>\r
             </source-roots>\r