@@ -857,11 +857,17 @@ |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
+ <ant antfile="${project.csip-soilsdb}/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-core}/build.xml" inheritall="false" target="jar"> |
<property name="deploy.on.save" value="false"/> |
</ant> |
+ <ant antfile="${project.csip-soilsdb}/build.xml" inheritall="false" target="jar"> |
+ <property name="deploy.on.save" value="false"/> |
+ </ant> |
</target> |
<target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/> |
<target depends="init,deps-jar,generate-rest-config" name="-pre-pre-compile"> |
@@ -1009,8 +1015,8 @@ |
<copyfiles files="${reference.csip-core.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="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${reference.csip-soilsdb.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.csip-gis-objects-2.0.32.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.csip-soilsdb-3.0.45.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.SDMDriver-1.0.5.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"/> |
@@ -1019,8 +1025,8 @@ |
<copyfiles files="${reference.csip-core.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="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${reference.csip-soilsdb.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.csip-gis-objects-2.0.32.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.csip-soilsdb-3.0.45.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.SDMDriver-1.0.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
</target> |
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
@@ -1436,6 +1442,7 @@ |
--> |
<target depends="init" name="deps-clean" unless="no.deps"> |
<ant antfile="${project.csip-core}/build.xml" inheritall="false" target="clean"/> |
+ <ant antfile="${project.csip-soilsdb}/build.xml" inheritall="false" target="clean"/> |
</target> |
<target depends="init" name="do-clean"> |
<condition property="build.dir.to.clean" value="${build.web.dir}"> |
@@ -3,8 +3,8 @@ |
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=d4c317a7 |
-nbproject/build-impl.xml.script.CRC32=f09dd48c |
+nbproject/build-impl.xml.data.CRC32=66096941 |
+nbproject/build-impl.xml.script.CRC32=c59089e8 |
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
nbproject/rest-build.xml.data.CRC32=bff4a8fe |
nbproject/rest-build.xml.script.CRC32=4734534b |
@@ -1,5 +1,4 @@ |
file.reference.csip-gis-objects-2.0.32.jar=lib/csip-gis-objects-2.0.32.jar |
-file.reference.csip-soilsdb-3.0.45.jar=lib/csip-soilsdb-3.0.45.jar |
file.reference.SDMDriver-1.0.5.jar=lib/SDMDriver-1.0.5.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.6.3.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/jaspic-api.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-de.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-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.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 |
#Thu Dec 17 13:44:22 MST 2015 |
@@ -12,6 +11,8 @@ |
dist.war=${dist.dir}/${war.name} |
javac.target=1.8 |
build.generated.dir=${build.dir}/generated |
+project.csip-soilsdb=../csip-soilsdb |
+reference.csip-soilsdb.jar=${project.csip-soilsdb}/dist/csip-soilsdb.jar |
resource.dir=setup |
build.web.excludes=${build.classes.excludes} |
war.ear.name=${war.name} |
@@ -56,8 +57,8 @@ |
${reference.csip-core.jar}:\ |
${libs.csip-geotools-15.1-2.classpath}:\ |
${libs.CSIP-Jersey-2.16.classpath}:\ |
+ ${reference.csip-soilsdb.jar}:\ |
${file.reference.csip-gis-objects-2.0.32.jar}:\ |
- ${file.reference.csip-soilsdb-3.0.45.jar}:\ |
${file.reference.SDMDriver-1.0.5.jar} |
javadoc.noindex=false |
webinf.dir=web/WEB-INF |
@@ -24,11 +24,11 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-gis-objects-2.0.32.jar}</file> |
+ <file>${reference.csip-soilsdb.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-soilsdb-3.0.45.jar}</file> |
+ <file>${file.reference.csip-gis-objects-2.0.32.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
@@ -53,6 +53,14 @@ |
<clean-target>clean</clean-target> |
<id>jar</id> |
</reference> |
+ <reference> |
+ <foreign-project>csip-soilsdb</foreign-project> |
+ <artifact-type>jar</artifact-type> |
+ <script>build.xml</script> |
+ <target>jar</target> |
+ <clean-target>clean</clean-target> |
+ <id>jar</id> |
+ </reference> |
</references> |
</configuration> |
</project> |
@@ -1,5 +1,5 @@ |
{ |
- "csip.context.version": "$version: 2.1.28 default 202 b67d962d9367 2021-03-16 od, built at 2021-12-28 12:43 by od$", |
+ "csip.context.version": "$version: 2.1.30 default 204 6496e4101dad 2022-01-18 od, built at 2022-01-18 17:51 by od$", |
"csip.archive.max.filesize": "1KB", |
"esd.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=esd;user=sa;password=csurams#1", |
"crdb.db": "jdbc:sqlserver://129.82.20.129:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |