You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/02/25 10:38:45 UTC
svn commit: r1449627 - in /sis/branches/JDK7/ide-project/NetBeans/nbproject:
build-impl.xml genfiles.properties project.xml
Author: desruisseaux
Date: Mon Feb 25 09:38:44 2013
New Revision: 1449627
URL: http://svn.apache.org/r1449627
Log:
Upgrade the NetBeans project configuration to NetBeans 7.3.
Modified:
sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1449627&r1=1449626&r2=1449627&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Mon Feb 25 09:38:44 2013
@@ -28,9 +28,9 @@ is divided into following sections:
</condition>
</fail>
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
- <!--
+ <!--
======================
- INITIALIZATION SECTION
+ INITIALIZATION SECTION
======================
-->
<target name="-pre-init">
@@ -382,6 +382,11 @@ is divided into following sections:
</and>
</condition>
</target>
+ <target name="-init-test-properties">
+ <property name="test.binaryincludes" value="<nothing>"/>
+ <property name="test.binarytestincludes" value=""/>
+ <property name="test.binaryexcludes" value=""/>
+ </target>
<target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${includes}" name="includes"/>
@@ -405,7 +410,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+ <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
<macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -422,6 +427,9 @@ is divided into following sections:
<fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -552,7 +560,7 @@ is divided into following sections:
</sequential>
</macrodef>
</target>
- <target if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
+ <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
<macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
<attribute default="${includes}" name="includes"/>
<attribute default="${excludes}" name="excludes"/>
@@ -569,6 +577,9 @@ is divided into following sections:
<fileset dir="${test.utility.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+ <filename name="${test.binarytestincludes}"/>
+ </fileset>
</batchtest>
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
@@ -946,7 +957,7 @@ is divided into following sections:
<target if="has.persistence.xml" name="-copy-persistence-xml">
<mkdir dir="${build.classes.dir}/META-INF"/>
<copy todir="${build.classes.dir}/META-INF">
- <fileset dir="${meta.inf.dir}" includes="persistence.xml"/>
+ <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
</copy>
</target>
<target name="-post-compile">
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1449627&r1=1449626&r2=1449627&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Mon Feb 25 09:38:44 2013
@@ -4,5 +4,5 @@ build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
nbproject/build-impl.xml.data.CRC32=e8191a2a
-nbproject/build-impl.xml.script.CRC32=aa05f102
-nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46
+nbproject/build-impl.xml.script.CRC32=2ddb9051
+nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1449627&r1=1449626&r2=1449627&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Mon Feb 25 09:38:44 2013
@@ -28,6 +28,8 @@
<word>loggings</word>
<word>marshallable</word>
<word>marshalled</word>
+ <word>marshaller</word>
+ <word>marshallers</word>
<word>marshalling</word>
<word>metadata</word>
<word>monospaced</word>
@@ -36,6 +38,8 @@
<word>timezone</word>
<word>Unicode</word>
<word>unmarshal</word>
+ <word>unmarshaller</word>
+ <word>unmarshallers</word>
<word>unmarshalling</word>
<word>whitespaces</word>
</spellchecker-wordlist>