Displaying differences for changeset
 
display as  

nbproject/ant-deploy.xml

@@ -1,42 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
 
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+      http://www.apache.org/licenses/LICENSE-2.0
 
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License.  When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
 
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
 -->
 <project default="-deploy-ant" basedir=".">
     <target name="-init" if="deploy.ant.enabled">

nbproject/build-impl.xml~

@@ -1012,7 +1012,7 @@
         <copyfiles files="${file.reference.jcommon-1.0.16.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jfreechart-1.0.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.Jama-1.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.csip-lib-water-3.3.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.csip-lib-water-4.1.1.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>
@@ -1023,7 +1023,7 @@
         <copyfiles files="${file.reference.jcommon-1.0.16.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jfreechart-1.0.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.Jama-1.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.csip-lib-water-3.3.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.csip-lib-water-4.1.1.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/project.properties

@@ -1,95 +1,95 @@
-file.reference.csip-lib-water-4.1.1.jar=lib/csip-lib-water-4.1.1.jar
-file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.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-ssi.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.20.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-cs.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-pt-BR.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
-#Fri May 06 09:05:19 MDT 2016
-javadoc.splitindex=true
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-build.classes.excludes=**/*.java,**/*.form
-javadoc.author=false
-j2ee.platform=1.6-web
-dist.war=${dist.dir}/${war.name}
-javac.target=1.8
-build.generated.dir=${build.dir}/generated
-resource.dir=setup
-build.web.excludes=${build.classes.excludes}
-war.ear.name=${war.name}
-j2ee.compile.on.save=true
-debug.test.classpath=${run.test.classpath}
-build.dir=build
-javac.deprecation=false
-persistence.xml.dir=${conf.dir}
-j2ee.copy.static.files.on.save=true
-test.src.dir=test
-junit.selected.version=4
-includes=**
-jar.compress=false
-annotation.processing.processors.list=
-javadoc.version=false
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-dist.dir=dist
-project.csip-core=../csip-core
-rest.config.type=ide
-javac.source=1.8
-javac.debug=true
-javac.test.processorpath=${javac.test.classpath}
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-build.generated.sources.dir=${build.dir}/generated-sources
-javadoc.notree=false
-runmain.jvmargs=
-source.root=src
-platform.active=default_platform
-javadoc.preview=true
-j2ee.deploy.on.save=true
-annotation.processing.enabled=true
-war.content.additional=
-dist.javadoc.dir=${dist.dir}/javadoc
-client.urlPart=
-javadoc.additionalparam=
-javac.classpath=\
-    ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${reference.csip-core.jar}:\
-    ${file.reference.commons-math-2.0.jar}:\
-    ${file.reference.jcommon-1.0.16.jar}:\
-    ${file.reference.jfreechart-1.0.13.jar}:\
-    ${file.reference.Jama-1.0.2.jar}:\
-    ${file.reference.csip-lib-water-4.1.1.jar}
-javadoc.noindex=false
-webinf.dir=web/WEB-INF
-annotation.processing.enabled.in.editor=true
-javadoc.private=false
-javadoc.encoding=${source.encoding}
-build.test.classes.dir=${build.dir}/test/classes
-reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
-web.docbase.dir=web
-javac.compilerargs=
-file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
-source.encoding=UTF-8
-dist.ear.war=${dist.dir}/${war.ear.name}
-j2ee.server.type=Tomcat
-file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
-conf.dir=${source.root}/conf
-annotation.processing.run.all.processors=true
-compile.jsps=false
-excludes=
-javac.processorpath=\
-    ${javac.classpath}
-build.test.results.dir=${build.dir}/test/results
-display.browser=false
-endorsed.classpath=\
-    ${libs.javaee-endorsed-api-6.0.classpath}
-javadoc.use=true
-build.web.dir=${build.dir}/web
-javadoc.nonavbar=false
-war.name=csip-cfa.war
-file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
-javadoc.windowtitle=
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit_4.classpath}:\
-    ${libs.hamcrest.classpath}
-src.dir=${source.root}/java
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-debug.classpath=${build.classes.dir}\:${javac.classpath}
+file.reference.csip-lib-water-4.1.1.jar=lib/csip-lib-water-4.1.1.jar
+file.reference.Jama-1.0.2.jar=lib/Jama-1.0.2.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.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
+#Fri May 06 09:05:19 MDT 2016
+javadoc.splitindex=true
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+build.classes.excludes=**/*.java,**/*.form
+javadoc.author=false
+j2ee.platform=1.6-web
+dist.war=${dist.dir}/${war.name}
+javac.target=1.8
+build.generated.dir=${build.dir}/generated
+resource.dir=setup
+build.web.excludes=${build.classes.excludes}
+war.ear.name=${war.name}
+j2ee.compile.on.save=true
+debug.test.classpath=${run.test.classpath}
+build.dir=build
+javac.deprecation=false
+persistence.xml.dir=${conf.dir}
+j2ee.copy.static.files.on.save=true
+test.src.dir=test
+junit.selected.version=4
+includes=**
+jar.compress=false
+annotation.processing.processors.list=
+javadoc.version=false
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+dist.dir=dist
+project.csip-core=../csip-core
+rest.config.type=ide
+javac.source=1.8
+javac.debug=true
+javac.test.processorpath=${javac.test.classpath}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+build.generated.sources.dir=${build.dir}/generated-sources
+javadoc.notree=false
+runmain.jvmargs=
+source.root=src
+platform.active=default_platform
+javadoc.preview=true
+j2ee.deploy.on.save=true
+annotation.processing.enabled=true
+war.content.additional=
+dist.javadoc.dir=${dist.dir}/javadoc
+client.urlPart=
+javadoc.additionalparam=
+javac.classpath=\
+    ${libs.CSIP-Jersey-2.16.classpath}:\
+    ${reference.csip-core.jar}:\
+    ${file.reference.commons-math-2.0.jar}:\
+    ${file.reference.jcommon-1.0.16.jar}:\
+    ${file.reference.jfreechart-1.0.13.jar}:\
+    ${file.reference.Jama-1.0.2.jar}:\
+    ${file.reference.csip-lib-water-4.1.1.jar}
+javadoc.noindex=false
+webinf.dir=web/WEB-INF
+annotation.processing.enabled.in.editor=true
+javadoc.private=false
+javadoc.encoding=${source.encoding}
+build.test.classes.dir=${build.dir}/test/classes
+reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
+web.docbase.dir=web
+javac.compilerargs=
+file.reference.commons-math-2.0.jar=lib/commons-math-2.0.jar
+source.encoding=UTF-8
+dist.ear.war=${dist.dir}/${war.ear.name}
+j2ee.server.type=Tomcat
+file.reference.jfreechart-1.0.13.jar=lib/jfreechart-1.0.13.jar
+conf.dir=${source.root}/conf
+annotation.processing.run.all.processors=true
+compile.jsps=false
+excludes=
+javac.processorpath=\
+    ${javac.classpath}
+build.test.results.dir=${build.dir}/test/results
+display.browser=false
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-6.0.classpath}
+javadoc.use=true
+build.web.dir=${build.dir}/web
+javadoc.nonavbar=false
+war.name=csip-cfa.war
+file.reference.jcommon-1.0.16.jar=lib/jcommon-1.0.16.jar
+javadoc.windowtitle=
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit_4.classpath}:\
+    ${libs.hamcrest.classpath}
+src.dir=${source.root}/java
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+debug.classpath=${build.classes.dir}\:${javac.classpath}

src/java/m/cfa/ApplicationConfig.java

@@ -5,7 +5,7 @@
 package m.cfa;
 
 import csip.Config;
-import csip.ContextConfig;
+
 import java.util.Set;
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Application;
@@ -25,8 +25,8 @@
     public Set<Class<?>> getClasses() {
         Set<Class<?>> resources = new java.util.HashSet<>();
         addRestResourceClasses(resources);
-        ContextConfig.filterServices(context, resources);
-        Config.register(resources);
+        
+        Config.register(resources, context);
         return resources;
     }
 

src/java/m/cfa/baseflow/V1_0.java

@@ -1,9 +1,9 @@
 package m.cfa.baseflow;
 
-import csip.Executable;
+import csip.api.server.Executable;
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.Resource;

src/java/m/cfa/baseflow/guiBaseflow_Model.java

@@ -6,7 +6,7 @@
 import m.cfa.DoubleMath;
 import m.cfa.FlowComparator;
 import m.cfa.Graphing;
-import csip.Executable;
+import csip.api.server.Executable;
 import java.awt.Color;
 import java.io.BufferedReader;
 import java.io.File;

src/java/m/cfa/download/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.download;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/drought/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.drought;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/durationcurve/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.durationcurve;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/errorstats/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.errorstats;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/flood/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.flood;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/loadest/V1_0.java

@@ -1,9 +1,9 @@
 package m.cfa.loadest;
 
-import csip.Executable;
+import csip.api.server.Executable;
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.Resource;

src/java/m/cfa/loadest/guiLOADEST_Model.java

@@ -6,7 +6,7 @@
 import WaterData.WaterQualityInfo;
 import m.cfa.DoubleArray;
 import m.cfa.DoubleMath;
-import csip.Executable;
+import csip.api.server.Executable;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;

src/java/m/cfa/regionalfdc/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.regionalfdc;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/stagedischarge/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.stagedischarge;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/storetservice/V1_0.java

@@ -3,8 +3,8 @@
 import WaterData.WaterData;
 import WaterData.WaterDataInterface;
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/timeseries/DFLOW_lowFlowStats.java

@@ -1,6 +1,6 @@
 package m.cfa.timeseries;
 
-import csip.Executable;
+import csip.api.server.Executable;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;

src/java/m/cfa/timeseries/V1_0.java

@@ -1,9 +1,9 @@
 package m.cfa.timeseries;
 
-import csip.Executable;
+import csip.api.server.Executable;
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.Resource;

src/java/m/cfa/timeseries/guiTimeseries_Model.java

@@ -3,7 +3,7 @@
 import WaterData.WaterData;
 import WaterData.WaterDataInterface;
 import WaterData.WaterQualityInfo;
-import csip.Executable;
+import csip.api.server.Executable;
 import m.cfa.FlowStatistics;
 import m.cfa.DoubleArray;
 import m.cfa.DoubleMath;

src/java/m/cfa/timeseries15min/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.timeseries15min;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.VersionInfo;

src/java/m/cfa/trends/V1_0.java

@@ -1,8 +1,8 @@
 package m.cfa.trends;
 
 import csip.ModelDataService;
-import csip.PayloadParameter;
-import csip.PayloadResults;
+import csip.api.server.PayloadParameter;
+import csip.api.server.PayloadResults;
 import csip.annotations.Description;
 import csip.annotations.Name;
 import csip.annotations.Resource;