Displaying differences for changeset
 
display as  

nbproject/build-impl.xml

@@ -1007,13 +1007,103 @@
     <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="${file.reference.aopalliance-repackaged-2.4.0-b09.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.asm-debug-all-5.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-beanutils-1.9.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-compress-1.9.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-pool-1.6.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.commons-pool2-2.4.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.hk2-api-2.4.0-b09.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.hk2-locator-2.4.0-b09.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.hk2-utils-2.4.0-b09.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.3.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.5.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.java-uuid-generator-3.1.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javassist-3.18.1-GA.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.annotation-api-1.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.inject-2.4.0-b09.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-3.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.javax.ws.rs-api-2.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jaxb-api-2.2.7.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jedis-2.8.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-client.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-common.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-container-servlet-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-container-servlet.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-guava-2.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-media-jaxb.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-media-json-jettison-2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-media-multipart-2.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jersey-server.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jettison-1.3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.json-org.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jsonassert-1.2.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.mimepull-1.9.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.mongo-java-driver-3.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.oms-3.3.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.org.osgi.core-4.2.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.osgi-resource-locator-1.0.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.persistence-api-1.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.4.1208.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.tomcat-jdbc.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.validation-api-1.1.0.Final.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.velocity-1.7-dep.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="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.aopalliance-repackaged-2.4.0-b09.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.asm-debug-all-5.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-beanutils-1.9.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-compress-1.9.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-io-2.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-logging-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-pool-1.6.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.commons-pool2-2.4.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.hk2-api-2.4.0-b09.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.hk2-locator-2.4.0-b09.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.hk2-utils-2.4.0-b09.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpclient-4.3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.3.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpcore-4.4.5.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.httpmime-4.3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.java-uuid-generator-3.1.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javassist-3.18.1-GA.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.annotation-api-1.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.inject-2.4.0-b09.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.servlet-api-3.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.javax.ws.rs-api-2.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jaxb-api-2.2.7.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jedis-2.8.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-client.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-common.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-container-servlet-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-container-servlet.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-guava-2.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-media-jaxb.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-media-json-jettison-2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-media-multipart-2.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jersey-server.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jettison-1.3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.json-org.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jsonassert-1.2.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mimepull-1.9.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.mongo-java-driver-3.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.oms-3.3.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.org.osgi.core-4.2.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.osgi-resource-locator-1.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.persistence-api-1.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.4.1208.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.sqljdbc42.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.tomcat-jdbc.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.validation-api-1.1.0.Final.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.velocity-1.7-dep.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"/>

nbproject/genfiles.properties

@@ -3,9 +3,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=50d34fe9
-nbproject/build-impl.xml.script.CRC32=f88a24a3
-nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
+nbproject/build-impl.xml.data.CRC32=97f9d427
+nbproject/build-impl.xml.script.CRC32=b5bffee7
+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
 nbproject/rest-build.xml.stylesheet.CRC32=5f13befe@1.21

nbproject/private/private.properties

@@ -1,5 +1,5 @@
 deploy.ant.properties.file=/home/pattersd/.netbeans/8.2/tomcat80.properties
-j2ee.server.domain=/home/pattersd/.netbeans/8.0/apache-tomcat-8.0.3.0_base
+j2ee.server.domain=/home/pattersd/.netbeans/8.2/apache-tomcat-8.0.27.0_base
 j2ee.server.home=/usr/local/apache-tomcat-8.0.27
 j2ee.server.instance=tomcat80:home=/usr/local/apache-tomcat-8.0.27:base=apache-tomcat-8.0.27.0_base
 javac.debug=true

nbproject/private/private.xml

@@ -23,6 +23,11 @@
             <file>file:/od/projects/csip-all/csip-example/test/service_tests/service.properties</file>
             <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/STest.java</file>
         </group>
-        <group/>
+        <group>
+            <file>file:/home/pattersd/work/csip-weather/src/java/m/weather/WeatherModelDataService.java</file>
+            <file>file:/home/pattersd/work/csip-weather/test/service_tests/PRISM_V1_0/prism-req.json</file>
+            <file>file:/home/pattersd/work/csip-weather/test/service_tests/NCWCD_V1_0/ncwcd-req.json</file>
+            <file>file:/home/pattersd/work/csip-weather/test/service_tests/MACA_V1_0/maca-req.json</file>
+        </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -1,3 +1,50 @@
+file.reference.aopalliance-repackaged-2.4.0-b09.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/aopalliance-repackaged-2.4.0-b09.jar
+file.reference.asm-debug-all-5.0.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/asm-debug-all-5.0.2.jar
+file.reference.commons-beanutils-1.9.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-beanutils-1.9.2.jar
+file.reference.commons-compress-1.9.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-compress-1.9.jar
+file.reference.commons-io-2.4.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-io-2.4.jar
+file.reference.commons-logging-1.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-logging-1.2.jar
+file.reference.commons-pool-1.6.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-pool-1.6.jar
+file.reference.commons-pool2-2.4.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/commons-pool2-2.4.2.jar
+file.reference.hk2-api-2.4.0-b09.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/hk2-api-2.4.0-b09.jar
+file.reference.hk2-locator-2.4.0-b09.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/hk2-locator-2.4.0-b09.jar
+file.reference.hk2-utils-2.4.0-b09.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/hk2-utils-2.4.0-b09.jar
+file.reference.httpclient-4.3.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/httpclient-4.3.3.jar
+file.reference.httpcore-4.3.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/httpcore-4.3.2.jar
+file.reference.httpcore-4.4.5.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/httpcore-4.4.5.jar
+file.reference.httpmime-4.3.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/httpmime-4.3.3.jar
+file.reference.java-uuid-generator-3.1.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/java-uuid-generator-3.1.3.jar
+file.reference.javassist-3.18.1-GA.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/javassist-3.18.1-GA.jar
+file.reference.javax.annotation-api-1.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/javax.annotation-api-1.2.jar
+file.reference.javax.inject-2.4.0-b09.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/javax.inject-2.4.0-b09.jar
+file.reference.javax.servlet-api-3.0.1.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/javax.servlet-api-3.0.1.jar
+file.reference.javax.ws.rs-api-2.0.1.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/javax.ws.rs-api-2.0.1.jar
+file.reference.jaxb-api-2.2.7.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jaxb-api-2.2.7.jar
+file.reference.jedis-2.8.0.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jedis-2.8.0.jar
+file.reference.jersey-client.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-client.jar
+file.reference.jersey-common.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-common.jar
+file.reference.jersey-container-servlet-core.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-container-servlet-core.jar
+file.reference.jersey-container-servlet.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-container-servlet.jar
+file.reference.jersey-guava-2.16.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-guava-2.16.jar
+file.reference.jersey-media-jaxb.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-media-jaxb.jar
+file.reference.jersey-media-json-jettison-2.0.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-media-json-jettison-2.0.jar
+file.reference.jersey-media-multipart-2.16.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-media-multipart-2.16.jar
+file.reference.jersey-server.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jersey-server.jar
+file.reference.jettison-1.3.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jettison-1.3.3.jar
+file.reference.json-org.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/json-org.jar
+file.reference.jsonassert-1.2.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/jsonassert-1.2.2.jar
+file.reference.mimepull-1.9.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/mimepull-1.9.3.jar
+file.reference.mongo-java-driver-3.0.2.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/mongo-java-driver-3.0.2.jar
+file.reference.oms-3.3.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/oms-3.3.jar
+file.reference.org.osgi.core-4.2.0.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/org.osgi.core-4.2.0.jar
+file.reference.osgi-resource-locator-1.0.1.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/osgi-resource-locator-1.0.1.jar
+file.reference.persistence-api-1.0.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/persistence-api-1.0.jar
+file.reference.postgresql-9.4.1208.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/postgresql-9.4.1208.jar
+file.reference.sqljdbc42.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/sqljdbc42.jar
+file.reference.tomcat-jdbc.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/tomcat-jdbc.jar
+file.reference.validation-api-1.1.0.Final.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/validation-api-1.1.0.Final.jar
+file.reference.velocity-1.7-dep.jar=/home/pattersd/work/csip-core/lib/csip-jersey-2.16/velocity-1.7-dep.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 Oct 27 08:37:37 MDT 2016
 javadoc.splitindex=true
 lib.dir=${web.docbase.dir}/WEB-INF/lib
@@ -12,7 +59,6 @@
 build.web.excludes=${build.classes.excludes}
 war.ear.name=${war.name}
 j2ee.compile.on.save=false
-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
 debug.test.classpath=${run.test.classpath}
 build.dir=build
 javac.deprecation=false
@@ -33,7 +79,9 @@
 javac.source=1.8
 javac.debug=true
 javac.test.processorpath=${javac.test.classpath}
-run.test.classpath=${javac.test.classpath}\:${build.test.classes.dir}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
 build.generated.sources.dir=${build.dir}/generated-sources
 auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
 javadoc.notree=false
@@ -47,7 +95,54 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 client.urlPart=
 javadoc.additionalparam=
-javac.classpath=${reference.csip-core.jar}\:${libs.CSIP-Jersey-2.16.classpath}
+javac.classpath=\
+    ${reference.csip-core.jar}:\
+    ${file.reference.aopalliance-repackaged-2.4.0-b09.jar}:\
+    ${file.reference.asm-debug-all-5.0.2.jar}:\
+    ${file.reference.commons-beanutils-1.9.2.jar}:\
+    ${file.reference.commons-compress-1.9.jar}:\
+    ${file.reference.commons-io-2.4.jar}:\
+    ${file.reference.commons-logging-1.2.jar}:\
+    ${file.reference.commons-pool-1.6.jar}:\
+    ${file.reference.commons-pool2-2.4.2.jar}:\
+    ${file.reference.hk2-api-2.4.0-b09.jar}:\
+    ${file.reference.hk2-locator-2.4.0-b09.jar}:\
+    ${file.reference.hk2-utils-2.4.0-b09.jar}:\
+    ${file.reference.httpclient-4.3.3.jar}:\
+    ${file.reference.httpcore-4.3.2.jar}:\
+    ${file.reference.httpcore-4.4.5.jar}:\
+    ${file.reference.httpmime-4.3.3.jar}:\
+    ${file.reference.java-uuid-generator-3.1.3.jar}:\
+    ${file.reference.javassist-3.18.1-GA.jar}:\
+    ${file.reference.javax.annotation-api-1.2.jar}:\
+    ${file.reference.javax.inject-2.4.0-b09.jar}:\
+    ${file.reference.javax.servlet-api-3.0.1.jar}:\
+    ${file.reference.javax.ws.rs-api-2.0.1.jar}:\
+    ${file.reference.jaxb-api-2.2.7.jar}:\
+    ${file.reference.jedis-2.8.0.jar}:\
+    ${file.reference.jersey-client.jar}:\
+    ${file.reference.jersey-common.jar}:\
+    ${file.reference.jersey-container-servlet-core.jar}:\
+    ${file.reference.jersey-container-servlet.jar}:\
+    ${file.reference.jersey-guava-2.16.jar}:\
+    ${file.reference.jersey-media-jaxb.jar}:\
+    ${file.reference.jersey-media-json-jettison-2.0.jar}:\
+    ${file.reference.jersey-media-multipart-2.16.jar}:\
+    ${file.reference.jersey-server.jar}:\
+    ${file.reference.jettison-1.3.3.jar}:\
+    ${file.reference.json-org.jar}:\
+    ${file.reference.jsonassert-1.2.2.jar}:\
+    ${file.reference.mimepull-1.9.3.jar}:\
+    ${file.reference.mongo-java-driver-3.0.2.jar}:\
+    ${file.reference.oms-3.3.jar}:\
+    ${file.reference.org.osgi.core-4.2.0.jar}:\
+    ${file.reference.osgi-resource-locator-1.0.1.jar}:\
+    ${file.reference.persistence-api-1.0.jar}:\
+    ${file.reference.postgresql-9.4.1208.jar}:\
+    ${file.reference.sqljdbc42.jar}:\
+    ${file.reference.tomcat-jdbc.jar}:\
+    ${file.reference.validation-api-1.1.0.Final.jar}:\
+    ${file.reference.velocity-1.7-dep.jar}
 javadoc.noindex=false
 webinf.dir=web/WEB-INF
 annotation.processing.enabled.in.editor=true
@@ -67,10 +162,12 @@
 annotation.processing.run.all.processors=true
 compile.jsps=false
 excludes=
-javac.processorpath=${javac.classpath}
+javac.processorpath=\
+    ${javac.classpath}
 build.test.results.dir=${build.dir}/test/results
 display.browser=false
-endorsed.classpath=${libs.javaee-endorsed-api-6.0.classpath}
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-6.0.classpath}
 javadoc.use=true
 build.web.dir=${build.dir}/web
 javadoc.nonavbar=false

nbproject/project.xml

@@ -16,7 +16,187 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${libs.CSIP-Jersey-2.16.classpath}</file>
+                    <file>${file.reference.aopalliance-repackaged-2.4.0-b09.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.asm-debug-all-5.0.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-beanutils-1.9.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-compress-1.9.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-io-2.4.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-logging-1.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-pool-1.6.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.commons-pool2-2.4.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.hk2-api-2.4.0-b09.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.hk2-locator-2.4.0-b09.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.hk2-utils-2.4.0-b09.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.httpclient-4.3.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.httpcore-4.3.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.httpcore-4.4.5.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.httpmime-4.3.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.java-uuid-generator-3.1.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javassist-3.18.1-GA.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.annotation-api-1.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.inject-2.4.0-b09.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.servlet-api-3.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.javax.ws.rs-api-2.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jaxb-api-2.2.7.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jedis-2.8.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-client.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-common.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-container-servlet-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-container-servlet.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-guava-2.16.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-media-jaxb.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-media-json-jettison-2.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-media-multipart-2.16.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jersey-server.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jettison-1.3.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.json-org.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jsonassert-1.2.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.mimepull-1.9.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.mongo-java-driver-3.0.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.oms-3.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.org.osgi.core-4.2.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.osgi-resource-locator-1.0.1.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.persistence-api-1.0.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.postgresql-9.4.1208.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.sqljdbc42.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.tomcat-jdbc.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.validation-api-1.1.0.Final.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.velocity-1.7-dep.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>

src/java/python/weatherExtraction.py

@@ -775,16 +775,26 @@
                         s = datetime.datetime.strptime(s, fmt).date()
                         e = datetime.datetime.strptime(e, fmt).date()
 
+                one_day = datetime.timedelta(days=1)
+
                 # Fill in missing data.
                 missing_row = [None,]*6
                 cur_date = start_date
                 while cur_date < s:
                     ret.append([station, cur_date.strftime('%Y-%m-%d')] + missing_row)
-                    cur_date += datetime.timedelta(days=1)
+                    cur_date += one_day
 
                 if station_data:
                     for row in station_data:
-                        assert len(row) == len(climate_data) + 2, "station data has wrong number of columns, expected {0}, got {1} for {2} [{3}]".format(len(climate_data)+2, len(row), row, climate_data)
+                        assert len(row) == len(climate_data) + 2, \
+                            "station data has wrong number of columns, expected {0}, got {1} for {2} [{3}]".format(len(climate_data)+2, len(row), row, climate_data)
+
+                        # Fill in any missing rows
+                        row_date = datetime.datetime.strptime(row[1], fmt).date()
+                        while cur_date < row_date:
+                            ret.append([station, cur_date.strftime('%Y-%m-%d')] + missing_row)
+                            cur_date += one_day
+                            
                         for itype in range(len(climate_data)):
                             climate_type = climate_data[itype]
                             units = self.data_units[time_type][climate_type]
@@ -793,12 +803,13 @@
                             row[itype+2] = conv_dict.get(units, ident)(v) if v else None
                             
                         ret.append(row)
+                        cur_date += one_day
 
                 # Pad at end
                 cur_date = e + datetime.timedelta(days=1)
                 while cur_date <= end_date:
                     ret.append([station, cur_date.strftime('%Y-%m-%d')] + missing_row)
-                    cur_date += datetime.timedelta(days=1)
+                    cur_date += one_day
         return ret
             
     def fetchWeatherData(self, *args, **kwargs):

test/service_tests/CoAgMet_V1_0/coagmet-req.json

@@ -4,11 +4,11 @@
     },
     "parameter": [{
         "name": "station_list",
-        "value": ["FTC01", "FTC03"],
+        "value": ["LCN01", "FTC03"],
         "description": "List of stations IDs"
     }, {
         "name": "units",
-        "value": "metric",
+        "value": "english",
         "description": "'metric' or 'english'"
     }, {
         "name": "start_date",

test/service_tests/CoAgMet_V1_0/service.properties

@@ -8,7 +8,3 @@
 
 # timeout for a single test, optional, defaults to 3000
 timeout=5000
-
-#
-test=keyvalue
-verify=keyvalue
\ No newline at end of file

test/service_tests/NCWCD_V1_0/ncwcd-req.json

@@ -10,7 +10,7 @@
         "value": "metric"
     }, {
         "name": "start_date",
-        "value": "2010-1-1"
+        "value": "1980-1-1"
     }, {
         "name": "end_date",
         "value": "2015-12-31"