sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1392166 - in /sis/trunk/ide-project/NetBeans: README.txt nbproject/build-impl.xml nbproject/genfiles.properties nbproject/project.properties nbproject/project.xml
Date Mon, 01 Oct 2012 02:33:58 GMT
Author: desruisseaux
Date: Mon Oct  1 02:33:58 2012
New Revision: 1392166

URL: http://svn.apache.org/viewvc?rev=1392166&view=rev
Log:
Added JDOM dependency, and removed references to non-existant test directories.

Modified:
    sis/trunk/ide-project/NetBeans/README.txt
    sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
    sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
    sis/trunk/ide-project/NetBeans/nbproject/project.properties
    sis/trunk/ide-project/NetBeans/nbproject/project.xml

Modified: sis/trunk/ide-project/NetBeans/README.txt
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/README.txt?rev=1392166&r1=1392165&r2=1392166&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/README.txt (original)
+++ sis/trunk/ide-project/NetBeans/README.txt Mon Oct  1 02:33:58 2012
@@ -17,9 +17,6 @@ modified by the NetBeans "Project proper
 BEFORE COMMITTING ANY CHANGE. Please preserve the formatting for easier
 reading. Ensure that all directories are relative to a variable.
 
-We recommend to modify this file by hand for adding new dependencies or new
-source directories instead than using the "Project properties" panel.
-
 
 nbproject/project.xml
 ---------------------

Modified: sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml?rev=1392166&r1=1392165&r2=1392166&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/build-impl.xml Mon Oct  1 02:33:58 2012
@@ -135,8 +135,6 @@ is divided into following sections:
         </condition>
         <condition property="have.tests">
             <or>
-                <available file="${test.webapp.dir}"/>
-                <available file="${test.app.dir}"/>
                 <available file="${test.referencing.dir}"/>
                 <available file="${test.utility.dir}"/>
             </or>
@@ -242,8 +240,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="test.webapp.dir">Must set test.webapp.dir</fail>
-        <fail unless="test.app.dir">Must set test.app.dir</fail>
         <fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
         <fail unless="test.utility.dir">Must set test.utility.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -420,12 +416,6 @@ is divided into following sections:
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${test.app.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -458,12 +448,6 @@ is divided into following sections:
                     <isset property="test.method"/>
                 </condition>
                 <union id="test.set">
-                    <fileset dir="${test.webapp.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
-                    <fileset dir="${test.app.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
-                        <filename name="@{testincludes}"/>
-                    </fileset>
                     <fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
@@ -579,12 +563,6 @@ is divided into following sections:
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed"
fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
                     <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${test.app.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -1309,13 +1287,11 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}"
srcdir="${test.webapp.dir}:${test.app.dir}:${test.referencing.dir}:${test.utility.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}"
srcdir="${test.referencing.dir}:${test.utility.dir}"/>
     </target>
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend"
if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}"
srcdir="${test.webapp.dir}:${test.app.dir}:${test.referencing.dir}:${test.utility.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}"
srcdir="${test.referencing.dir}:${test.utility.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
-            <fileset dir="${test.app.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
         </copy>
@@ -1332,10 +1308,8 @@ is divided into following sections:
     <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single"
if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}"
processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.app.dir}:${test.referencing.dir}:${test.utility.dir}"
srcdir="${test.webapp.dir}:${test.app.dir}:${test.referencing.dir}:${test.utility.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}"
processorpath="${javac.test.processorpath}" sourcepath="${test.referencing.dir}:${test.utility.dir}"
srcdir="${test.referencing.dir}:${test.utility.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
-            <fileset dir="${test.app.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
         </copy>

Modified: sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties?rev=1392166&r1=1392165&r2=1392166&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/genfiles.properties Mon Oct  1 02:33:58 2012
@@ -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=90182fd5
-nbproject/build-impl.xml.script.CRC32=43091626
+nbproject/build-impl.xml.data.CRC32=d6149061
+nbproject/build-impl.xml.script.CRC32=a54bea32
 nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46

Modified: sis/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1392166&r1=1392165&r2=1392166&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties Mon Oct  1 02:33:58 2012
@@ -26,9 +26,7 @@ run.jvmargs          = -ea
 project.root         = ../..
 src.local-src.dir    = ../local-src
 src.webapp.dir       = ${project.root}/sis-webapp/src/main/java
-test.webapp.dir      = ${project.root}/sis-webapp/src/test/java
 src.app.dir          = ${project.root}/sis-app/src/main/java
-test.app.dir         = ${project.root}/sis-app/src/test/java
 src.referencing.dir  = ${project.root}/sis-core/src/main/java
 test.referencing.dir = ${project.root}/sis-core/src/test/java
 src.metadata.dir     = ${project.root}/sis-metadata/src/main/java
@@ -45,6 +43,7 @@ jsr275.version       = 0.9.3
 vecmath.version      = 1.5.2
 georss.version       = 0.9.8
 rome.version         = 0.9
+jdom.version         = 1.0
 servlet.version      = 2.4
 jcip.version         = 1.0
 junit.version        = 4.8.2
@@ -61,6 +60,7 @@ javac.classpath=\
     ${maven.repository}/java3d/vecmath/${vecmath.version}/vecmath-${vecmath.version}.jar:\
     ${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
     ${maven.repository}/rome/rome/${rome.version}/rome-${rome.version}.jar:\
+    ${maven.repository}/jdom/jdom/${jdom.version}/jdom-${jdom.version}.jar:\
     ${maven.repository}/javax/servlet/servlet-api/${servlet.version}/servlet-api-${servlet.version}.jar:\
     ${maven.repository}/net/jcip/jcip-annotations/${jcip.version}/jcip-annotations-${jcip.version}.jar:\
     ${maven.repository}/junit/junit/${junit.version}/junit-${junit.version}.jar

Modified: sis/trunk/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.xml?rev=1392166&r1=1392165&r2=1392166&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.xml Mon Oct  1 02:33:58 2012
@@ -13,8 +13,6 @@
                 <root id="src.utility.dir" name="Utility"/>
             </source-roots>
             <test-roots>
-                <root id="test.webapp.dir" name="Web application tests"/>
-                <root id="test.app.dir" name="Application tests"/>
                 <root id="test.referencing.dir" name="Referencing tests"/>
                 <root id="test.utility.dir" name="Utility tests"/>
             </test-roots>



Mime
View raw message