Displaying differences for changeset
display as  

src/java/m/datadownload/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;
 
 /**
@@ -16,12 +18,16 @@
 @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/datadownload/V1_0.java

@@ -1,8 +1,8 @@
 package m.datadownload;
 
 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.setDirectory(getWorkspaceDir().toString());
+        model.setDirectory(workspace().getDir().toString());
         
         PayloadParameter inputPayload = parameter();
         model.setAttributeFile(inputPayload.getString("attribute_file"));

src/java/m/datadownload/V1_0.json

@@ -97,4 +97,4 @@
       "value": true
     }
   ]
-}
\ No newline at end of file
+}

src/java/m/datadownload/guiDataDownloads.java

@@ -33,7 +33,7 @@
 */
 public class guiDataDownloads {
     //Inputs
-    String directory            = "C:/Projects/TylerWible/CodeDirectories/NetBeans/data/DataDownloads";
+    String directory            = "E:/Projects/TylerWible_repos/NetBeans/data/DataDownloads";
     String beginDate             = "";//user defined begin date
     String endDate               = "";//user defined end date
     boolean USGSflowTF           = true;//if true then flow data will be downloaded for USGS stations
@@ -56,9 +56,9 @@
                                    "USGS\tn/a\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\n" + 
                                    "USGS Wells\tn/a\t332432091031501\tD0016  WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\n" + 
                                    "SNOTEL\tn/a\t330\tBeaver Divide\t40.61666667\t-111.1\tWasatch\tUTAH\tUnited States\t\t\t8280\tfeet\t\t1978-10-01\t\tn/a\tn/a\n" + 
-                                   "STORET\t11NPSWRD\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\n" + 
+//                                   "STORET\t11NPSWRD\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\n" + 
                                    "NADP\tn/a\tCO21\tManitou\t39.1008\t-105.0933\tTeller\tCOLORADO\tUSA\t\t\t2362\tm\t\t1978-10-17\t\tn/a\tn/a\n" + 
-                                   "CDSN\tCITYFTCO_WQX\tPBOXC\tCache La Poudre River above Boxelder Creek, Site C\t40.551282\t-105.008726\tLarimer\tCOLORADO\tUSA\t\t\t\t\t\t\t\tn/a\tn/a\n" + 
+//                                   "CDSN\tCITYFTCO_WQX\tPBOXC\tCache La Poudre River above Boxelder Creek, Site C\t40.551282\t-105.008726\tLarimer\tCOLORADO\tUSA\t\t\t\t\t\t\t\tn/a\tn/a\n" + 
                                    "CDWR\tn/a\tDEUDITCO\tDEUEL SNYDER CANAL\t40.282657\t-103.848246\t\tColorado\tUnited States\t\t\t\t\t\t2008-03-31\t2014-09-25\tn/a\tn/a";//the contents of a tab-delimited input file
     //Outputs