csip-rhem Displaying differences for changeset

Displaying differences for changeset

display as Allow wrapping

nbproject/build-impl.xml

 @@ -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-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">
 @@ -1007,17 +1013,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="${libs.csip-jersey-2.16.classpath}" 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="${libs.CSIP-Jersey-2.16.classpath}" 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"/>
           <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="${libs.CSIP-GeoTools.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-gis-objects.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
++        <copyfiles files="${libs.csip-geotools.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"/>
 @@ -1432,6 +1438,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-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}">

nbproject/genfiles.properties

@@ -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=3b3eef5c

-nbproject/build-impl.xml.script.CRC32=675481aa

+nbproject/build-impl.xml.data.CRC32=d10fb8ef

+nbproject/build-impl.xml.script.CRC32=f20b4705

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/project.properties

 @@ -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-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
++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
   #Thu Dec 17 13:44:22 MST 2015
   javadoc.splitindex=true
   lib.dir=${web.docbase.dir}/WEB-INF/lib
 @@ -53,9 +53,9 @@
   javadoc.additionalparam=
   javac.classpath=\
       ${reference.csip-core.jar}:\
--    ${libs.csip-jersey-2.16.classpath}:\
--    ${libs.CSIP-GeoTools.classpath}:\
--    ${reference.csip-gis-objects.jar}
++    ${libs.CSIP-Jersey-2.16.classpath}:\
++    ${reference.csip-gis-objects.jar}:\
++    ${libs.csip-geotools.classpath}
   javadoc.noindex=false
   webinf.dir=web/WEB-INF
   annotation.processing.enabled.in.editor=true

nbproject/project.xml

 @@ -16,17 +16,17 @@
                       <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>
--                <library dirs="200">
--                    <file>${libs.CSIP-GeoTools.classpath}</file>
++                    <file>${libs.CSIP-Jersey-2.16.classpath}</file>
                       <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.classpath}</file>
++                    <path-in-war>WEB-INF/lib</path-in-war>
++                </library>
               </web-module-libraries>
               <web-module-additional-libraries/>
               <source-roots>