nbproject/project.properties
| @@ -1,5 +1,5 @@ |
| file.reference.csip-lib-water-1.1.8.jar=lib/csip-lib-water-1.1.8.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 |
| +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 Apr 07 13:44:06 MDT 2017 |
| javadoc.splitindex=true |
| lib.dir=${web.docbase.dir}/WEB-INF/lib |
src/java/m/groundwater/ApplicationConfig.java
| @@ -6,7 +6,9 @@ |
| |
| import csip.Config; |
| import java.util.Set; |
| +import javax.servlet.ServletContext; |
| import javax.ws.rs.core.Application; |
| +import javax.ws.rs.core.Context; |
| import org.glassfish.jersey.media.multipart.MultiPartFeature; |
| |
| /** |
| @@ -15,13 +17,17 @@ |
| */ |
| @javax.ws.rs.ApplicationPath("") |
| public class ApplicationConfig extends Application { |
| + |
| + @Context |
| + private ServletContext context; |
| |
| @Override |
| public Set<Class<?>> getClasses() { |
| Set<Class<?>> resources = new java.util.HashSet<Class<?>>(); |
| resources.add(MultiPartFeature.class); |
| addRestResourceClasses(resources); |
| - Config.registry().register(resources); |
| + |
| + Config.register(resources, context); |
| return resources; |
| } |
| |
src/java/m/groundwater/V1_0.java
| @@ -1,8 +1,8 @@ |
| package m.groundwater; |
| |
| 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; |
| @@ -19,7 +19,7 @@ |
| |
| @Override |
| protected void preProcess() throws Exception { |
| - model.setMainFolder(getWorkspaceDir().toString()); |
| + model.setDirectory(workspace().getDir().toString()); |
| |
| PayloadParameter inputPayload = parameter(); |
| model.setDatabase(inputPayload.getString("database")); |
| @@ -50,7 +50,7 @@ |
| protected void postProcess() throws Exception { |
| PayloadResults resultPayload = results(); |
| // files |
| - File wd = getWorkspaceDir(); |
| + File wd = workspace().getDir(); |
| resultPayload.put(new File(wd, model.getGraph()), |
| //Below are the result graph files for use by JHighCharts on eRAMS for duplicating the above graphs |
| model.getGWgraphOutput()); |
src/java/m/groundwater/guiGroundwater_Model.java
| @@ -279,7 +279,7 @@ |
| |
| |
| //Sets |
| - public void setMainFolder(String directory_str){ directory = directory_str; } |
| + public void setDirectory(String directory_str){ directory = directory_str; } |
| public void setDatabase(String database_str){ database = database_str; } |
| public void setStationID(String stationId_str){ stationId = stationId_str; } |
| public void setStationName(String stationName_str){ stationName = stationName_str; } |