@@ -854,7 +854,7 @@ |
COMPILATION SECTION |
--> |
<target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"> |
- <ant antfile="${project.csip-core-1}/build.xml" inheritall="false" target="jar"> |
+ <ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
<ant antfile="${project.csip-gis-objects}/build.xml" inheritall="false" target="jar"> |
@@ -862,7 +862,7 @@ |
</ant> |
</target> |
<target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"> |
- <ant antfile="${project.csip-core-1}/build.xml" inheritall="false" target="jar"> |
+ <ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
<ant antfile="${project.csip-gis-objects}/build.xml" inheritall="false" target="jar"> |
@@ -1012,18 +1012,18 @@ |
</target> |
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/> |
<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="${reference.csip-gis-objects.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${libs.csip-geotools.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${reference.csip-core-1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${reference.csip-gis-objects.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="${libs.CSIP-Jersey-2.16.classpath}" 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="${reference.csip-gis-objects.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${libs.csip-geotools.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${reference.csip-core-1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${reference.csip-gis-objects.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="${libs.CSIP-Jersey-2.16.classpath}" 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"/> |
@@ -1437,7 +1437,7 @@ |
CLEANUP SECTION |
--> |
<target depends="init" name="deps-clean" unless="no.deps"> |
- <ant antfile="${project.csip-core-1}/build.xml" inheritall="false" target="clean"/> |
+ <ant antfile="${project.csip-core}/build.xml" inheritall="false" target="clean"/> |
<ant antfile="${project.csip-gis-objects}/build.xml" inheritall="false" target="clean"/> |
</target> |
<target depends="init" name="do-clean"> |
@@ -16,9 +16,9 @@ |
build.xml.stylesheet.CRC32=651128d4@1.65.1.1 |
# 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=955ba723 |
-nbproject/build-impl.xml.script.CRC32=56f8d6e1 |
-nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 |
+nbproject/build-impl.xml.data.CRC32=31dadbbb |
+nbproject/build-impl.xml.script.CRC32=e978f98f |
+nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 |
nbproject/rest-build.xml.data.CRC32=bff4a8fe |
nbproject/rest-build.xml.script.CRC32=4734534b |
nbproject/rest-build.xml.stylesheet.CRC32=5f13befe@1.21 |
@@ -1,4 +1,4 @@ |
-j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
+j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.1.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
javadoc.splitindex=true |
lib.dir=${web.docbase.dir}/WEB-INF/lib |
auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss\:/css |
@@ -8,9 +8,8 @@ |
dist.war=${dist.dir}/${war.name} |
javac.target=1.8 |
build.generated.dir=${build.dir}/generated |
-project.csip-core-1=../../csip-core |
-project.csip-gis-objects=../../csip-gis-objects |
-reference.csip-core-1.jar=${project.csip-core-1}/dist/csip-core.jar |
+project.csip-gis-objects=../csip-gis-objects |
+reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
reference.csip-gis-objects.jar=${project.csip-gis-objects}/dist/csip-gis-objects.jar |
resource.dir=setup |
build.web.excludes=${build.classes.excludes} |
@@ -53,10 +52,10 @@ |
client.urlPart= |
javadoc.additionalparam= |
javac.classpath=\ |
+ ${reference.csip-core.jar}:\ |
+ ${reference.csip-gis-objects.jar}:\ |
${libs.csip-geotools.classpath}:\ |
- ${reference.csip-core-1.jar}:\ |
- ${reference.csip-gis-objects.jar}:\ |
- ${libs.csip-jersey-2.16.classpath} |
+ ${libs.CSIP-Jersey-2.16.classpath} |
javadoc.noindex=false |
webinf.dir=web/WEB-INF |
annotation.processing.enabled.in.editor=true |
@@ -12,11 +12,7 @@ |
<minimum-ant-version>1.6.5</minimum-ant-version> |
<web-module-libraries> |
<library dirs="200"> |
- <file>${libs.csip-geotools.classpath}</file> |
- <path-in-war>WEB-INF/lib</path-in-war> |
- </library> |
- <library dirs="200"> |
- <file>${reference.csip-core-1.jar}</file> |
+ <file>${reference.csip-core.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
@@ -24,7 +20,11 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${libs.csip-jersey-2.16.classpath}</file> |
+ <file>${libs.csip-geotools.classpath}</file> |
+ <path-in-war>WEB-INF/lib</path-in-war> |
+ </library> |
+ <library dirs="200"> |
+ <file>${libs.CSIP-Jersey-2.16.classpath}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
</web-module-libraries> |
@@ -38,7 +38,7 @@ |
</data> |
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> |
<reference> |
- <foreign-project>csip-core-1</foreign-project> |
+ <foreign-project>csip-core</foreign-project> |
<artifact-type>jar</artifact-type> |
<script>build.xml</script> |
<target>jar</target> |