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/07/01 17:13:17 UTC
svn commit: r1498512 - in /sis/branches/JDK7/ide-project: NetBeans/build.xml
NetBeans/nbproject/build-impl.xml NetBeans/nbproject/genfiles.properties
NetBeans/nbproject/project.properties NetBeans/nbproject/project.xml
resources-links/
Author: desruisseaux
Date: Mon Jul 1 15:13:16 2013
New Revision: 1498512
URL: http://svn.apache.org/r1498512
Log:
(NetBeans IDE configuration only): removed the symbolic links to the resources, replaced by a plain copy task, because the symbolic links seem to confuse some tools (RAT plugin, embedded SVN).
Removed:
sis/branches/JDK7/ide-project/resources-links/
Modified:
sis/branches/JDK7/ide-project/NetBeans/build.xml
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.properties
sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
Modified: sis/branches/JDK7/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/build.xml?rev=1498512&r1=1498511&r2=1498512&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/build.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/build.xml Mon Jul 1 15:13:16 2013
@@ -7,11 +7,11 @@
<import file="nbproject/build-impl.xml"/>
<!--
- Called before JAR creation. Copies the "*.utf" resources files created by Maven.
+ Called after compilation. Copies the "*.utf" resources files created by Maven.
Note that the Apache SIS project must have been build by Maven at least once it
can be built by the NetBeans IDE.
-->
- <target name="-pre-jar">
+ <target name="-post-compile">
<copy todir="${build.classes.dir}/org/apache/sis/util/resources">
<fileset dir="${project.root}/core/sis-utility/target/classes/org/apache/sis/util/resources">
<include name="*.utf"/>
@@ -22,10 +22,25 @@
<copy todir="${build.classes.dir}">
<fileset dir="${project.root}/core/sis-utility/src/main/resources">
<include name="META-INF/services/*"/>
+ <include name="**/*.properties"/>
</fileset>
<fileset dir="${project.root}/core/sis-metadata/src/main/resources">
<include name="META-INF/services/*"/>
</fileset>
+ <fileset dir="${project.root}/application/sis-console/src/main/resources">
+ <include name="**/*.properties"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!--
+ Called after compilation of test classes in order to copy test files.
+ -->
+ <target name="-post-compile-test">
+ <copy todir="${build.test.classes.dir}">
+ <fileset dir="${project.root}/core/sis-metadata/src/test/resources">
+ <include name="**/*.xml"/>
+ </fileset>
</copy>
</target>
</project>
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=1498512&r1=1498511&r2=1498512&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Mon Jul 1 15:13:16 2013
@@ -153,7 +153,6 @@ is divided into following sections:
<available file="${src.referencing.dir}"/>
<available file="${src.metadata.dir}"/>
<available file="${src.utility.dir}"/>
- <available file="${src.resources.dir}"/>
</or>
</condition>
<condition property="netbeans.home+have.tests">
@@ -249,7 +248,6 @@ is divided into following sections:
<fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
<fail unless="src.utility.dir">Must set src.utility.dir</fail>
- <fail unless="src.resources.dir">Must set src.resources.dir</fail>
<fail unless="test.console.dir">Must set test.console.dir</fail>
<fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail>
<fail unless="test.storage.dir">Must set test.storage.dir</fail>
@@ -276,7 +274,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.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -316,7 +314,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.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -348,7 +346,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.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}" name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}" name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -991,7 +989,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.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}"/>
@@ -1004,7 +1002,6 @@ is divided into following sections:
<fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.utility.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
</copy>
</target>
<target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -1025,7 +1022,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.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}"/>
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1310,9 +1307,6 @@ is divided into following sections:
<fileset dir="${src.utility.dir}" excludes="*.java,${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.resources.dir}" excludes="*.java,${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/*.java"/>
<exclude name="*.java"/>
@@ -1344,9 +1338,6 @@ is divided into following sections:
<fileset dir="${src.utility.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/doc-files/**"/>
</fileset>
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=1498512&r1=1498511&r2=1498512&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 Jul 1 15:13:16 2013
@@ -3,6 +3,6 @@
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=ca153f28
-nbproject/build-impl.xml.script.CRC32=cd693ddf
+nbproject/build-impl.xml.data.CRC32=d45d31b9
+nbproject/build-impl.xml.script.CRC32=bdea8683
nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1498512&r1=1498511&r2=1498512&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Mon Jul 1 15:13:16 2013
@@ -26,7 +26,6 @@ junit.forkmode = once
#
project.root = ../..
src.local-src.dir = ../local-src
-src.resources.dir = ../resources-links
src.webapp.dir = ${project.root}/application/sis-webapp/src/main/java
src.console.dir = ${project.root}/application/sis-console/src/main/java
test.console.dir = ${project.root}/application/sis-console/src/test/java
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=1498512&r1=1498511&r2=1498512&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Mon Jul 1 15:13:16 2013
@@ -13,7 +13,6 @@
<root id="src.referencing.dir" name="Referencing"/>
<root id="src.metadata.dir" name="Metadata"/>
<root id="src.utility.dir" name="Utility"/>
- <root id="src.resources.dir" name="Resources"/>
</source-roots>
<test-roots>
<root id="test.console.dir" name="Test Console"/>