Displaying differences for changeset
 
display as  

nbproject/project.properties

@@ -73,8 +73,8 @@
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

src/java/m/cfa/ApplicationConfig.java

@@ -34,6 +34,7 @@
         resources.add(csip.ControlService.class);
         resources.add(csip.QueryService.class);
         resources.add(csip.ReportService.class);
+        resources.add(csip.UIService.class);
         resources.add(m.cfa.Baseflow_V1_0.class);
         resources.add(m.cfa.Download_V1_0.class);
         resources.add(m.cfa.Drought_V1_0.class);

src/java/m/cfa/Baseflow_V1_0.java

@@ -5,7 +5,6 @@
 import csip.ModelDataService;
 import csip.annotations.Resource;
 import csip.annotations.ResourceType;
-import csip.annotations.Resources;
 import java.io.File;
 import javax.ws.rs.Path;
 import oms3.annotations.Description;
@@ -17,9 +16,7 @@
 @Description("baseflow")
 @VersionInfo("1.0")
 @Path("m/cfa/baseflow/1.0")
-@Resources({
-    @Resource(file="/bin/win-x86/bflow.exe", wine=true, id="bf", type=ResourceType.EXECUTABLE)
-})
+@Resource(file="/bin/win-x86/bflow.exe", wine=true, id="bf", type=ResourceType.EXECUTABLE)
 public class Baseflow_V1_0 extends ModelDataService {
 
     guiBaseflow_Model model = new guiBaseflow_Model();

src/java/m/cfa/LOADEST_V1_0.java

@@ -15,9 +15,7 @@
 @Description("loadest")
 @VersionInfo("1.0")
 @Path("m/cfa/loadest/1.0")
-@Resources({
-    @Resource(file="/bin/win-x86/loadest.exe", wine=true, id="ld", type=ResourceType.EXECUTABLE)
-})
+@Resource(file="/bin/win-x86/loadest.exe", wine=true, id="ld", type=ResourceType.EXECUTABLE)
 public class LOADEST_V1_0 extends ModelDataService {
 
     guiLOADEST_Model model = new guiLOADEST_Model();