@@ -558,7 +558,8 @@ |
<formatter type="brief" usefile="false"/> |
<formatter type="xml"/> |
<jvmarg value="-ea"/> |
- <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
+ <jvmarg line="${debug-args-line}"/> |
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
<customize/> |
</junit> |
</sequential> |
@@ -590,7 +591,8 @@ |
<formatter type="xml"/> |
<jvmarg value="-ea"/> |
<jvmarg line="${run.jvmargs.ide}"/> |
- <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
+ <jvmarg line="${debug-args-line}"/> |
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
<customize/> |
</junit> |
</sequential> |
@@ -748,6 +750,18 @@ |
</macrodef> |
</target> |
<target name="-init-debug-args"> |
+ <property name="version-output" value="java version "${ant.java.version}"/> |
+ <condition property="have-jdk-older-than-1.4"> |
+ <or> |
+ <contains string="${version-output}" substring="java version "1.0"/> |
+ <contains string="${version-output}" substring="java version "1.1"/> |
+ <contains string="${version-output}" substring="java version "1.2"/> |
+ <contains string="${version-output}" substring="java version "1.3"/> |
+ </or> |
+ </condition> |
+ <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> |
+ <istrue value="${have-jdk-older-than-1.4}"/> |
+ </condition> |
<condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> |
<os family="windows"/> |
</condition> |
@@ -764,7 +778,8 @@ |
<sequential> |
<java classname="@{classname}" fork="true"> |
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
- <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
+ <jvmarg line="${debug-args-line}"/> |
+ <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
<jvmarg line="${runmain.jvmargs}"/> |
<classpath> |
<path path="@{classpath}"/> |
@@ -839,17 +854,11 @@ |
COMPILATION SECTION |
--> |
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"> |
- <ant antfile="${project.csip-common}/build.xml" inheritall="false" target="jar"> |
- <property name="deploy.on.save" value="false"/> |
- </ant> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
</target> |
<target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"> |
- <ant antfile="${project.csip-common}/build.xml" inheritall="false" target="jar"> |
- <property name="deploy.on.save" value="false"/> |
- </ant> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
@@ -999,22 +1008,22 @@ |
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest"> |
<copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${reference.csip-common.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.csip-gis-objects-2.0.43.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.csip-common-1.0.39.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${libs.csip-geotools-15.1-2.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.SDMDriver-1.0.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.csip-soilsdb-FPAC.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.csip-soilsdb-FPAC.11.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.SDMDriver-1.0.8.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<mkdir dir="${build.web.dir}/META-INF"/> |
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
</target> |
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> |
<copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${reference.csip-common.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.csip-gis-objects-2.0.43.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.csip-common-1.0.39.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${libs.csip-geotools-15.1-2.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.SDMDriver-1.0.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.csip-soilsdb-FPAC.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.csip-soilsdb-FPAC.11.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.SDMDriver-1.0.8.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
</target> |
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
<delete dir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1419,7 +1428,6 @@ |
</target> |
<target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> |
<target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> |
- <target depends="debug-test-method" name="debug-single-method"/> |
<target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> |
<webproject1:nbjpdareload dir="${build.test.classes.dir}"/> |
</target> |
@@ -1429,7 +1437,6 @@ |
CLEANUP SECTION |
--> |
<target depends="init" name="deps-clean" unless="no.deps"> |
- <ant antfile="${project.csip-common}/build.xml" inheritall="false" target="clean"/> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="clean"/> |
</target> |
<target depends="init" name="do-clean"> |
@@ -35,9 +35,10 @@ |
endorsed.classpath=\ |
${libs.javaee-endorsed-api-7.0.classpath} |
excludes= |
+file.reference.csip-common-1.0.39.jar=lib/csip-common-1.0.39.jar |
file.reference.csip-gis-objects-2.0.43.jar=lib/csip-gis-objects-2.0.43.jar |
-file.reference.csip-soilsdb-FPAC.8.jar=lib/csip-soilsdb-FPAC.8.jar |
-file.reference.SDMDriver-1.0.7.jar=lib/SDMDriver-1.0.7.jar |
+file.reference.csip-soilsdb-FPAC.11.jar=lib/csip-soilsdb-FPAC.11.jar |
+file.reference.SDMDriver-1.0.8.jar=lib/SDMDriver-1.0.8.jar |
includes=** |
j2ee.compile.on.save=true |
j2ee.copy.static.files.on.save=true |
@@ -49,11 +50,11 @@ |
javac.classpath=\ |
${reference.csip-core.jar}:\ |
${libs.CSIP-Jersey-2.16.classpath}:\ |
- ${reference.csip-common.jar}:\ |
${file.reference.csip-gis-objects-2.0.43.jar}:\ |
+ ${file.reference.csip-common-1.0.39.jar}:\ |
${libs.csip-geotools-15.1-2.classpath}:\ |
- ${file.reference.SDMDriver-1.0.7.jar}:\ |
- ${file.reference.csip-soilsdb-FPAC.8.jar} |
+ ${file.reference.csip-soilsdb-FPAC.11.jar}:\ |
+ ${file.reference.SDMDriver-1.0.8.jar} |
# Space-separated list of extra javac options |
javac.compilerargs=-Xlint:deprecation |
javac.debug=true |
@@ -82,10 +83,8 @@ |
lib.dir=${web.docbase.dir}/WEB-INF/lib |
persistence.xml.dir=${conf.dir} |
platform.active=default_platform |
-project.csip-common=../csip-common |
project.csip-core=../csip-core |
project.license=CSIP |
-reference.csip-common.jar=${project.csip-common}/dist/csip-common.jar |
reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
resource.dir=setup |
rest.config.type=ide |
@@ -96,7 +95,6 @@ |
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): |
runmain.jvmargs= |
source.encoding=UTF-8 |
-source.reference.csip-soilsdb-FPAC.8.jar=../csip-soilsdb/src/ |
source.root=src |
src.dir=${source.root}/java |
test.src.dir=test |
@@ -18,11 +18,11 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${reference.csip-common.jar}</file> |
+ <file>${file.reference.csip-gis-objects-2.0.43.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-gis-objects-2.0.43.jar}</file> |
+ <file>${file.reference.csip-common-1.0.39.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
@@ -30,11 +30,11 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.SDMDriver-1.0.7.jar}</file> |
+ <file>${file.reference.csip-soilsdb-FPAC.11.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-soilsdb-FPAC.8.jar}</file> |
+ <file>${file.reference.SDMDriver-1.0.8.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
</web-module-libraries> |
@@ -49,14 +49,6 @@ |
<libraries xmlns="http://www.netbeans.org/ns/cdnjs-libraries/1"/> |
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> |
<reference> |
- <foreign-project>csip-common</foreign-project> |
- <artifact-type>jar</artifact-type> |
- <script>build.xml</script> |
- <target>jar</target> |
- <clean-target>clean</clean-target> |
- <id>jar</id> |
- </reference> |
- <reference> |
<foreign-project>csip-core</foreign-project> |
<artifact-type>jar</artifact-type> |
<script>build.xml</script> |