Displaying differences for changeset
 
display as  

nbproject/build-impl.xml

@@ -1097,7 +1097,6 @@
         <copyfiles files="${file.reference.jts-1.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.vecmath-1.3.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.xsd-2.6.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.csip-gis-objects.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>
@@ -1193,7 +1192,6 @@
         <copyfiles files="${file.reference.jts-1.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.vecmath-1.3.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xsd-2.6.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.csip-gis-objects.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/private/private.xml

@@ -43,13 +43,14 @@
             <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/simple-res.json</file>
         </group>
         <group name="csip-core">
+            <file>file:/od/projects/csip-all/csip-example/test/service_tests/m_simpleservice_2.0-variant.json</file>
+            <file>file:/od/projects/csip-all/csip-example/deploy/localhost/csip.sh</file>
             <file>file:/od/projects/csip-all/csip-example/build.xml</file>
+            <file>file:/od/projects/csip-all/csip-example/nbproject/project.properties</file>
+            <file>file:/od/projects/csip-all/csip-example/test/service_tests/externalexe/simple-req.json</file>
+            <file>file:/od/projects/csip-all/csip-example/test/service_tests/STest.java</file>
             <file>file:/od/projects/csip-all/csip-example/web/META-INF/csip-conf.json</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/test/service_tests/simpleservice_V2_0/STest.java</file>
-            <file>file:/od/projects/csip-all/csip-example/nbproject/build-impl.xml~</file>
-            <file>file:/od/projects/csip-all/csip-example/nbproject/project.properties</file>
-            <file>file:/od/projects/csip-all/csip-example/src/java/m/example/gis_geotools/V1_0.java</file>
+            <file>file:/od/projects/csip-all/csip-example/test/service_tests/m_externalexe_1.0.json</file>
         </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -12,7 +12,6 @@
 file.reference.commons-pool-1.5.4.jar=lib/commons-pool-1.5.4.jar
 file.reference.core.commands-3.6.0.I20100512-1500.jar=lib/core.commands-3.6.0.I20100512-1500.jar
 file.reference.core.runtime-3.6.0.v20100505.jar=lib/core.runtime-3.6.0.v20100505.jar
-file.reference.csip-gis-objects.jar=../csip-gis-objects/dist/csip-gis-objects.jar
 file.reference.eastwood-1.1.1-20090908.jar=lib/eastwood-1.1.1-20090908.jar
 file.reference.ecore-2.6.1.jar=lib/ecore-2.6.1.jar
 file.reference.ehcache-1.6.2.jar=lib/ehcache-1.6.2.jar
@@ -88,7 +87,7 @@
 file.reference.jts-1.13.jar=lib/jts-1.13.jar
 file.reference.vecmath-1.3.2.jar=lib/vecmath-1.3.2.jar
 file.reference.xsd-2.6.0.jar=lib/xsd-2.6.0.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-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.1.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-spdy.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
 #Mon Nov 09 10:36:44 MST 2015
 javadoc.splitindex=true
 lib.dir=${web.docbase.dir}/WEB-INF/lib
@@ -230,8 +229,7 @@
     ${file.reference.jsr-275-1.0-beta-2.jar}:\
     ${file.reference.jts-1.13.jar}:\
     ${file.reference.vecmath-1.3.2.jar}:\
-    ${file.reference.xsd-2.6.0.jar}:\
-    ${file.reference.csip-gis-objects.jar}
+    ${file.reference.xsd-2.6.0.jar}
 javadoc.noindex=false
 webinf.dir=web/WEB-INF
 annotation.processing.enabled.in.editor=true

nbproject/project.xml

@@ -375,10 +375,6 @@
                     <file>${file.reference.xsd-2.6.0.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.csip-gis-objects.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

src/java/m/example/ApplicationConfig.java

@@ -39,5 +39,20 @@
      * resources defined in the project.
      */
     private void addRestResourceClasses(Set<Class<?>> resources) {
+        resources.add(csip.ArchiveService.class);
+        resources.add(csip.CatalogService.class);
+        resources.add(csip.ControlService.class);
+        resources.add(csip.QueryService.class);
+        resources.add(csip.ReportService.class);
+        resources.add(csip.UIService.class);
+        resources.add(m.example.externalexe.V1_0.class);
+        resources.add(m.example.gis_geotools.V1_0.class);
+        resources.add(m.example.gis_objects.V1_0.class);
+        resources.add(m.example.jdbc.V1_0.class);
+        resources.add(m.example.logging.V1_0.class);
+        resources.add(m.example.pythonscript.V1_0.class);
+        resources.add(m.example.simpleservice.V1_0.class);
+        resources.add(m.example.simpleservice.V2_0.class);
+        resources.add(m.example.simpleservice.V3.class);
     }
 }

src/java/m/example/gis_objects/V1_0.java

@@ -5,9 +5,9 @@
  */
 package m.example.gis_objects;
 
-import GISObjects.GISObject;
-import GISObjects.GISObjectConsumerFactory;
-import GISObjects.GISObjectFactory;
+//import GISObjects.GISObject;
+//import GISObjects.GISObjectConsumerFactory;
+//import GISObjects.GISObjectFactory;
 import csip.ModelDataService;
 import csip.ServiceException;
 import csip.annotations.Resource;
@@ -41,37 +41,37 @@
 })
 public class V1_0 extends ModelDataService {
 
-    JSONObject aoa_geometry;
-    double finalArea;
-
-    @Override
-    protected void preProcess() throws csip.ServiceException {
-        Map<String, JSONObject> inputParams = getParamMap();
-        if (inputParams.containsKey("aoa_geometry")) {
-            aoa_geometry = inputParams.get("aoa_geometry");
-        } else {
-            throw new csip.ServiceException("Missing input parameter 'aoa_geometry'.");
-        }
-    }
-
-    @Override
-    protected void doProcess() throws ServiceException {
-        GISObject inputGIS;
-        try (Connection connection = getResourceJDBC("mssql");) {
-            GISObjectFactory.setGISObjectEngine(GISObjectConsumerFactory.createGISEngine(connection));
-            inputGIS = GISObjects.GISObjectFactory.createGISObject(aoa_geometry);
-
-            finalArea = inputGIS.areaInAcres();
-
-        } catch (SQLException | JSONException | IOException ex) {
-            LOG.log(Level.SEVERE, null, ex);
-            throw new csip.ServiceException("Cannot process request: ", ex);
-        }
-    }
-
-    @Override
-    protected void postProcess() throws csip.ServiceException {
-        putResult("area", finalArea, "Area of the aoa_geometry specified", "Acres");
-    }
+//    JSONObject aoa_geometry;
+//    double finalArea;
+//
+//    @Override
+//    protected void preProcess() throws csip.ServiceException {
+//        Map<String, JSONObject> inputParams = getParamMap();
+//        if (inputParams.containsKey("aoa_geometry")) {
+//            aoa_geometry = inputParams.get("aoa_geometry");
+//        } else {
+//            throw new csip.ServiceException("Missing input parameter 'aoa_geometry'.");
+//        }
+//    }
+//
+//    @Override
+//    protected void doProcess() throws ServiceException {
+//        GISObject inputGIS;
+//        try (Connection connection = getResourceJDBC("mssql");) {
+//            GISObjectFactory.setGISObjectEngine(GISObjectConsumerFactory.createGISEngine(connection));
+//            inputGIS = GISObjects.GISObjectFactory.createGISObject(aoa_geometry);
+//
+//            finalArea = inputGIS.areaInAcres();
+//
+//        } catch (SQLException | JSONException | IOException ex) {
+//            LOG.log(Level.SEVERE, null, ex);
+//            throw new csip.ServiceException("Cannot process request: ", ex);
+//        }
+//    }
+//
+//    @Override
+//    protected void postProcess() throws csip.ServiceException {
+//        putResult("area", finalArea, "Area of the aoa_geometry specified", "Acres");
+//    }
 
 }