Displaying differences for changeset
 
display as  

nbproject/private/private.xml

@@ -32,18 +32,19 @@
         </group>
         <group name="csip-nrcs"/>
         <group name="csip-core">
+            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/stats/V1_0.json</file>
+            <file>file:/od/projects/csip-all/csip-example/deploy/localhost/conf.json</file>
+            <file>file:/od/projects/csip-all/csip-example/build.xml</file>
+            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V3.java</file>
+            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/externalexe/V1_0.java</file>
             <file>file:/od/projects/csip-all/csip-example/deploy/8092/conf.json</file>
             <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.json</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/client/example/Call_apache.java</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/python/driver.py</file>
             <file>file:/od/projects/csip-all/csip-example/src/java/client/example/Call.py</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/Check.java</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V3.java</file>
+            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V1_0.java</file>
             <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.java</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V1_0.java</file>
-            <file>file:/od/projects/csip-all/csip-example/web/WEB-INF/csip-defaults.json</file>
+            <file>file:/od/projects/csip-all/csip-example/deploy/localhost/conf.sh</file>
             <file>file:/od/projects/csip-all/csip-example/src/java/m/example/ApplicationConfig.java</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V1_0.json</file>
+            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/stats/V1_0.java</file>
         </group>
     </open-files>
 </project-private>

src/java/m/example/externalexe/V1_0.java

@@ -10,7 +10,6 @@
 import csip.annotations.*;
 import static csip.annotations.ResourceType.*;
 import javax.ws.rs.Path;
-import oms3.annotations.*;
 
 /**
  * External model service. Invoking the mod.exe model  with arguments.

src/java/m/example/jdbc/V1_0.java

@@ -15,7 +15,6 @@
 import java.util.logging.Level;
 import javax.ws.rs.Path;
 import static m.example.jdbc.PoolClass.P_ID;
-import oms3.annotations.*;
 
 /*
   @Resource(file = "${connect.url}", env = {"maxWait=10000",

src/java/m/example/simpleservice/V2_0.java

@@ -7,17 +7,20 @@
 
 import csip.ServiceException;
 import javax.ws.rs.Path;
-import oms3.annotations.*;
-import csip.annotations.Stage;
+import static csip.annotations.State.*;
+import csip.annotations.State;
+import csip.annotations.*;
 
 @Name("conv #2")
 @Description("Example of an simple service")
+@Documentation("https://alm.engr.colostate.edu/csip")
+@State(PROTOTYPE)
+@License("http://gnu.org")
+@VersionInfo("$Id:$")
+@Author(name = "od", contact = "<odavid@colostate.edu>", org = "CSU")
+@Category("Examples")
+
 @Path("m/simpleservice/2.0")
-//@QA(RELEASED)
-@Stage("Stay away.")
-//@Deprecated
-//@Resource(file = "/data/us_cvalues_topo2ras_masked.zip", type = ARCHIVE)
-//@Resource(file = "/data/us_cvalues_topo2ras_masked.tif", type = REFERENCE, id = "tiff")
 public class V2_0 extends csip.ModelDataService {
 
     @Override
@@ -27,7 +30,7 @@
         double temp = getDoubleParam("temp_c");
         String un = getParamUnit("temp_c");
         if (un.equals("C")) {
-            putResult("temp", temp * 9 / 5 + 32,"temperature", "F");
+            putResult("temp", temp * 9 / 5 + 32, "temperature", "F");
             return;
         }
         throw new ServiceException("missing unit.");

src/java/m/example/simpleservice/V3.java

@@ -6,7 +6,11 @@
 package m.example.simpleservice;
 
 import csip.annotations.*;
-import oms3.annotations.*;
+import oms3.annotations.Unit;
+import oms3.annotations.Description;
+import oms3.annotations.In;
+import oms3.annotations.Out;
+import oms3.annotations.Execute;
 import javax.ws.rs.Path;
 
 @Name("Temperature conversion.")

src/java/m/example/stats/V1_0.java

@@ -53,8 +53,6 @@
         putResult("median", med,"Median");
         putResult("q3", q3,"3nd Quartile");
         putResult("max", max,"maximum");
-       
-        
     }
     
     public static double[] toDoubleArray(List<Double> data) {