Displaying differences for changeset
 
display as  

.hgtags

@@ -1,3 +1,4 @@
 d19a793c6862beccb38d63dee6bacb41dae1c994 0.1
 1f50e5e931cecc2cc15a4b155a1c854308cd82c9 .1
 f37432c7172bda9498f61a6e5ba0d7ae6850595e 0.2
+e48c009d2234d3d2551985209398cf4778ec83e8 0.3

build.xml

@@ -9,7 +9,7 @@
 <!-- in the project's Project Properties dialog box.-->
 <project name="csip-wqm" default="default" basedir=".">
     <description>Builds, tests, and runs the project csip-wqm.</description>
-    <import file="../csip-core/jenkins-build.xml"/>
+    <import file="../../csip-core/jenkins-build.xml"/>
     <import file="nbproject/build-impl.xml"/>
     
     <target name="-post-dist"> 

deploy/8083/conf.json

@@ -2,14 +2,14 @@
  "csip.timezone": "MST7MDT",
  "csip.logging.backend": "mongodb",
  "csip.logging.level": "INFO",
- "csip.logging.mongodb.uri": "mongodb://172.1.6.51:27017/csip",
+ "csip.logging.mongodb.uri": "mongodb://172.1.6.30:27017/csip",
  "csip.logging.keepsevere": "false",
  "csip.session.ttl": "PT3S",
- "csip.session.mongodb.uri": "mongodb://172.1.6.51:27017/csip",
+ "csip.session.mongodb.uri": "mongodb://172.1.6.30:27017/csip",
  "csip.session.backend": "mongodb",
  "csip.session.ttl.failed": "PT3000S",
  "csip.archive.backend": "none",
- "csip.archive.mongodb.uri": "mongodb://172.1.6.51:27017/csip",
+ "csip.archive.mongodb.uri": "mongodb://172.1.6.30:27017/csip",
  "csip.archive.ttl": "P7D",
  "csip.accesslog.backend": "none",
  "csip.accesslog.postgres.url": "jdbc:postgresql://192.168.10.110:5432/csiplog?user=postgres",

deploy/8083/conf.sh

@@ -1,2 +1,2 @@
 action=deploy
-version=0.2.116-2.1.66
+version=0.3.2-2.1.73

deploy/8092/conf.sh

@@ -1,2 +1,2 @@
 action=deploy
-version=0.2.116-2.1.66
+version=0.3.2-2.1.73

nbproject/build-impl.xml

@@ -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="${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-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"/>
         <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="${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-geotools.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"/>

nbproject/genfiles.properties

@@ -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=390036e5
-nbproject/build-impl.xml.script.CRC32=d881371e
-nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
+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/rest-build.xml.data.CRC32=bff4a8fe
 nbproject/rest-build.xml.script.CRC32=4734534b
 nbproject/rest-build.xml.stylesheet.CRC32=5f13befe@1.21

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-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
+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
 javadoc.splitindex=true
 lib.dir=${web.docbase.dir}/WEB-INF/lib
 auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss\:/css
@@ -8,7 +8,9 @@
 dist.war=${dist.dir}/${war.name}
 javac.target=1.8
 build.generated.dir=${build.dir}/generated
-project.csip-gis-objects=../csip-gis-objects
+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
 reference.csip-gis-objects.jar=${project.csip-gis-objects}/dist/csip-gis-objects.jar
 resource.dir=setup
 build.web.excludes=${build.classes.excludes}
@@ -19,7 +21,6 @@
 javac.deprecation=true
 persistence.xml.dir=${conf.dir}
 j2ee.copy.static.files.on.save=false
-reference.csip-core-1.jar=${project.csip-core-1}/dist/csip-core.jar
 auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less\:/css
 test.src.dir=test
 auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
@@ -52,14 +53,13 @@
 client.urlPart=
 javadoc.additionalparam=
 javac.classpath=\
+    ${libs.csip-geotools.classpath}:\
     ${reference.csip-core-1.jar}:\
     ${reference.csip-gis-objects.jar}:\
-    ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${libs.csip-geotools.classpath}
+    ${libs.csip-jersey-2.16.classpath}
 javadoc.noindex=false
 webinf.dir=web/WEB-INF
 annotation.processing.enabled.in.editor=true
-project.csip-core-1=../csip-core
 javadoc.private=false
 javadoc.encoding=${source.encoding}
 build.test.classes.dir=${build.dir}/test/classes

nbproject/project.xml

@@ -12,6 +12,10 @@
             <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>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
@@ -20,11 +24,7 @@
                     <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>
             </web-module-libraries>

web/WEB-INF/csip-defaults.json

@@ -1,4 +1,4 @@
 { 
-    "csip-wqm.version": "$version: 0.2.105 c30e3e837395 2016-05-31 rob.streetman, built at 2016-06-01 10:31 by od$"
+    "csip-wqm.version": "$version: 0.2.118 e48c009d2234 2016-06-14 Shaun Case, built at 2016-06-15 15:09 by robert$"
 }