@@ -857,17 +857,11 @@ |
<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"> |
- <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-gis-objects}/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"> |
@@ -1013,17 +1007,17 @@ |
<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-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="${file.reference.csip-gis-objects-2.0.17.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="${reference.csip-gis-objects.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="${file.reference.csip-gis-objects-2.0.17.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"/> |
@@ -1438,7 +1432,6 @@ |
--> |
<target depends="init" name="deps-clean" unless="no.deps"> |
<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"> |
<condition property="build.dir.to.clean" value="${build.web.dir}"> |
@@ -1,4 +1,5 @@ |
-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.2.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-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
+file.reference.csip-gis-objects-2.0.17.jar=lib/csip-gis-objects-2.0.17.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-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.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/sqljdbc42.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-util.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
#Thu Dec 17 13:44:22 MST 2015 |
javadoc.splitindex=true |
lib.dir=${web.docbase.dir}/WEB-INF/lib |
@@ -9,8 +10,6 @@ |
dist.war=${dist.dir}/${war.name} |
javac.target=1.8 |
build.generated.dir=${build.dir}/generated |
-project.csip-gis-objects=../csip-gis-objects |
-reference.csip-gis-objects.jar=${project.csip-gis-objects}/dist/csip-gis-objects.jar |
resource.dir=setup |
build.web.excludes=${build.classes.excludes} |
war.ear.name=${war.name} |
@@ -53,9 +52,9 @@ |
javadoc.additionalparam= |
javac.classpath=\ |
${reference.csip-core.jar}:\ |
- ${reference.csip-gis-objects.jar}:\ |
${libs.csip-geotools-15.1-2.classpath}:\ |
- ${libs.CSIP-Jersey-2.16.classpath} |
+ ${libs.CSIP-Jersey-2.16.classpath}:\ |
+ ${file.reference.csip-gis-objects-2.0.17.jar} |
javadoc.noindex=false |
webinf.dir=web/WEB-INF |
annotation.processing.enabled.in.editor=true |
@@ -16,10 +16,6 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${reference.csip-gis-objects.jar}</file> |
- <path-in-war>WEB-INF/lib</path-in-war> |
- </library> |
- <library dirs="200"> |
<file>${libs.csip-geotools-15.1-2.classpath}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
@@ -27,6 +23,10 @@ |
<file>${libs.CSIP-Jersey-2.16.classpath}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
+ <library dirs="200"> |
+ <file>${file.reference.csip-gis-objects-2.0.17.jar}</file> |
+ <path-in-war>WEB-INF/lib</path-in-war> |
+ </library> |
</web-module-libraries> |
<web-module-additional-libraries/> |
<source-roots> |
@@ -45,14 +45,6 @@ |
<clean-target>clean</clean-target> |
<id>jar</id> |
</reference> |
- <reference> |
- <foreign-project>csip-gis-objects</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,11 +1,10 @@ |
package m.rhem.rhem03_compEsd; |
|
-import GISObjects.GISEngine; |
-import GISObjects.GISEngineFactory; |
-import static GISObjects.GISEngineFactory.createGISEngine; |
-import GISObjects.GISObject; |
-import GISObjects.GISObjectException; |
-import GISObjects.GISObjectFactory; |
+import gisobjects.db.GISEngine; |
+import static gisobjects.db.GISEngineFactory.createGISEngine; |
+import gisobjects.GISObject; |
+import gisobjects.GISObjectException; |
+import gisobjects.GISObjectFactory; |
import csip.ModelDataService; |
import csip.ServiceException; |
import csip.annotations.Polling; |