Author: sijskes
Date: Tue Oct 9 18:56:30 2012
New Revision: 1396199
URL: http://svn.apache.org/viewvc?rev=1396199&view=rev
Log:
fixed netbeans project files.
Modified:
river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
river/jtsk/trunk/netbeans/qa-testing/nbproject/build-impl.xml
river/jtsk/trunk/netbeans/qa-testing/nbproject/genfiles.properties
river/jtsk/trunk/netbeans/qa-testing/nbproject/project.properties
river/jtsk/trunk/netbeans/qa-testing/nbproject/project.xml
Modified: river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties?rev=1396199&r1=1396198&r2=1396199&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties (original)
+++ river/jtsk/trunk/netbeans/onebigjar/nbproject/project.properties Tue Oct 9
18:56:30 2012
@@ -56,8 +56,8 @@ javac.compilerargs=
javac.deprecation=true
javac.processorpath=\
${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.6
+javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
Modified: river/jtsk/trunk/netbeans/qa-testing/nbproject/build-impl.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/qa-testing/nbproject/build-impl.xml?rev=1396199&r1=1396198&r2=1396199&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/qa-testing/nbproject/build-impl.xml (original)
+++ river/jtsk/trunk/netbeans/qa-testing/nbproject/build-impl.xml Tue Oct 9
18:56:30 2012
@@ -140,7 +140,6 @@ is divided into following sections:
</condition>
<condition property="have.sources">
<or>
- <available file="${src.src.dir}"/>
<available file="${src.dir}"/>
</or>
</condition>
@@ -229,7 +228,6 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target
depends="-pre-init,-init-private,-init-user,-init-project,-do-init"
name="-init-check">
- <fail unless="src.src.dir">Must set src.src.dir</fail>
<fail unless="src.dir">Must set src.dir</fail>
<fail unless="test.src.dir">Must set test.src.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
@@ -252,7 +250,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" if="ap.supported.internal"
name="-init-macrodef-javac-with-processors">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";>
- <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
+ <attribute default="${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -292,7 +290,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties"
name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3";>
- <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
+ <attribute default="${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -324,7 +322,7 @@ is divided into following sections:
</target>
<target
depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors"
name="-init-macrodef-javac">
<macrodef name="depend"
uri="http://www.netbeans.org/ns/j2se-project/3";>
- <attribute default="${src.src.dir}:${src.dir}" name="srcdir"/>
+ <attribute default="${src.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -918,12 +916,11 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend
srcdir="${src.src.dir}:${src.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile,
-copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
<copy todir="${build.classes.dir}">
- <fileset dir="${src.src.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
@@ -945,7 +942,7 @@ is divided into following sections:
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
<fail unless="javac.includes">Must select some files in the IDE or set
javac.includes</fail>
<j2seproject3:force-recompile/>
- <j2seproject3:javac excludes=""
gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.src.dir}:${src.dir}"/>
+ <j2seproject3:javac excludes=""
gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1206,9 +1203,6 @@ is divided into following sections:
<classpath>
<path path="${javac.classpath}"/>
</classpath>
- <fileset dir="${src.src.dir}" excludes="*.java,${excludes}"
includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
<fileset dir="${src.dir}" excludes="*.java,${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1219,9 +1213,6 @@ is divided into following sections:
<arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
</javadoc>
<copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.src.dir}" excludes="${excludes}"
includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
<fileset dir="${src.dir}" excludes="${excludes}"
includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
Modified: river/jtsk/trunk/netbeans/qa-testing/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/qa-testing/nbproject/genfiles.properties?rev=1396199&r1=1396198&r2=1396199&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/qa-testing/nbproject/genfiles.properties
(original)
+++ river/jtsk/trunk/netbeans/qa-testing/nbproject/genfiles.properties Tue Oct
9 18:56:30 2012
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ddcdaa0c
+build.xml.data.CRC32=6d283e84
build.xml.script.CRC32=792afd5c
[email protected]
# This file is used by a NetBeans-based IDE to track changes in generated
files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never
regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ddcdaa0c
-nbproject/build-impl.xml.script.CRC32=90f4c757
+nbproject/build-impl.xml.data.CRC32=6d283e84
+nbproject/build-impl.xml.script.CRC32=2b3c5e05
nbproject/[email protected]
Modified: river/jtsk/trunk/netbeans/qa-testing/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/qa-testing/nbproject/project.properties?rev=1396199&r1=1396198&r2=1396199&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/qa-testing/nbproject/project.properties (original)
+++ river/jtsk/trunk/netbeans/qa-testing/nbproject/project.properties Tue Oct
9 18:56:30 2012
@@ -39,8 +39,8 @@ javac.compilerargs=
javac.deprecation=true
javac.processorpath=\
${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.6
+javac.target=1.6
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
@@ -82,6 +82,5 @@ run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
-src.dir=src
-src.src.dir=${file.reference.qa-src}
+src.dir=${file.reference.qa-src}
test.src.dir=test
Modified: river/jtsk/trunk/netbeans/qa-testing/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/netbeans/qa-testing/nbproject/project.xml?rev=1396199&r1=1396198&r2=1396199&view=diff
==============================================================================
--- river/jtsk/trunk/netbeans/qa-testing/nbproject/project.xml (original)
+++ river/jtsk/trunk/netbeans/qa-testing/nbproject/project.xml Tue Oct 9
18:56:30 2012
@@ -5,7 +5,6 @@
<data xmlns="http://www.netbeans.org/ns/j2se-project/3";>
<name>qa-testing</name>
<source-roots>
- <root id="src.src.dir"/>
<root id="src.dir"/>
</source-roots>
<test-roots>
