.hgtags
@@ -86,3 +86,4 @@ |
21cb8d021c8ebb7fa5c316dc09cb2a02caeeaf2d 1.6 |
de5d7379eac1614d99a18ee6996a9614fa7cc6fe 1.7 |
dcd7855a1c5c790e25d21d768e7dc4b21435f39d 1.8 |
+63b500f6529dac513b61c2f782f6218d6394445c 1.9 |
nbproject/ant-deploy.xml
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-4.1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.csip-lib-water-4.2.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-4.1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.csip-lib-water-4.2.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/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,4 +1,4 @@ |
-file.reference.csip-lib-water-4.1.1.jar=lib/csip-lib-water-4.1.1.jar |
+file.reference.csip-lib-water-4.2.1.jar=lib/csip-lib-water-4.2.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 |
@@ -54,7 +54,7 @@ |
${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} |
+ ${file.reference.csip-lib-water-4.2.1.jar} |
javadoc.noindex=false |
webinf.dir=web/WEB-INF |
annotation.processing.enabled.in.editor=true |
nbproject/project.xml
@@ -36,7 +36,7 @@ |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
<library dirs="200"> |
- <file>${file.reference.csip-lib-water-4.1.1.jar}</file> |
+ <file>${file.reference.csip-lib-water-4.2.1.jar}</file> |
<path-in-war>WEB-INF/lib</path-in-war> |
</library> |
</web-module-libraries> |
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; |