Displaying differences for changeset
 
display as  

nbproject/project.properties

@@ -1,116 +1,116 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
-auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
-auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
-auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
-auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
-auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
-auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
-build.classes.dir=${build.web.dir}/WEB-INF/classes
-build.classes.excludes=**/*.java,**/*.form
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-build.web.dir=${build.dir}/web
-build.web.excludes=${build.classes.excludes}
-client.urlPart=
-compile.jsps=false
-conf.dir=${source.root}/conf
-debug.classpath=${build.classes.dir}:${javac.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-display.browser=false
-# Files to be excluded from distribution war
-dist.archive.excludes=
-dist.dir=dist
-dist.ear.war=${dist.dir}/${war.ear.name}
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.war=${dist.dir}/${war.name}
-endorsed.classpath=\
-    ${libs.javaee-endorsed-api-7.0.classpath}
-excludes=
-file.reference.csip-common-1.0.12.jar=lib/csip-common-1.0.12.jar
-file.reference.csip-gis-objects-2.0.32.jar=lib/csip-gis-objects-2.0.32.jar
-file.reference.csip-soilsdb-3.5.52.jar=lib/csip-soilsdb-3.5.52.jar
-file.reference.jsr-275-1.0-beta-2.jar=lib/jsr-275-1.0-beta-2.jar
-file.reference.MetaModelTools.jar=lib/MetaModelTools.jar
-file.reference.SDMDriver-1.0.7.jar=lib/SDMDriver-1.0.7.jar
-file.reference.tomcat-juli.jar=lib/tomcat-juli.jar
-file.reference.WepsTranslator-1.8.1.jar=lib/WepsTranslator-1.8.1.jar
-includes=**
-j2ee.compile.on.save=true
-j2ee.copy.static.files.on.save=true
-j2ee.deploy.on.save=false
-j2ee.platform=1.7-web
-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.6.3.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-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.server.type=Tomcat
-jar.compress=false
-javac.classpath=\
-    ${reference.csip-core.jar}:\
-    ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${libs.csip-geotools-15.1-2.classpath}:\
-    ${file.reference.csip-common-1.0.12.jar}:\
-    ${file.reference.csip-gis-objects-2.0.32.jar}:\
-    ${file.reference.jsr-275-1.0-beta-2.jar}:\
-    ${file.reference.csip-soilsdb-3.5.52.jar}:\
-    ${file.reference.SDMDriver-1.0.7.jar}:\
-    ${file.reference.MetaModelTools.jar}:\
-    ${file.reference.tomcat-juli.jar}:\
-    ${file.reference.WepsTranslator-1.8.1.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:deprecation
-javac.debug=true
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.preview=true
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-lib.dir=${web.docbase.dir}/WEB-INF/lib
-persistence.xml.dir=${conf.dir}
-platform.active=default_platform
-project.csip-core=../csip-core
-project.license=CSIP
-reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
-resource.dir=setup
-rest.config.type=ide
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
-runmain.jvmargs=
-source.encoding=UTF-8
-source.reference.csip-gis-objects-2.0.32.jar=../csip-gis-ogjects/src/
-source.reference.csip-soilsdb-3.5.52.jar=../csip-soilsdb/src
-source.reference.MetaModelTools.jar=tools/MetaModelTools/src
-source.root=src
-src.dir=${source.root}/java
-test.src.dir=test
-war.content.additional=
-war.ear.name=${war.name}
-war.name=csip-crp.war
-web.docbase.dir=web
-webinf.dir=web/WEB-INF
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
+auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
+auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+display.browser=false
+# Files to be excluded from distribution war
+dist.archive.excludes=
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+endorsed.classpath=\
+    ${libs.javaee-endorsed-api-7.0.classpath}
+excludes=
+file.reference.csip-common-1.0.12.jar=lib/csip-common-1.0.12.jar
+file.reference.csip-gis-objects-2.0.32.jar=lib/csip-gis-objects-2.0.32.jar
+file.reference.csip-soilsdb-3.5.52.jar=lib/csip-soilsdb-3.5.52.jar
+file.reference.jsr-275-1.0-beta-2.jar=lib/jsr-275-1.0-beta-2.jar
+file.reference.MetaModelTools.jar=lib/MetaModelTools.jar
+file.reference.SDMDriver-1.0.7.jar=lib/SDMDriver-1.0.7.jar
+file.reference.tomcat-juli.jar=lib/tomcat-juli.jar
+file.reference.WepsTranslator-1.8.1.jar=lib/WepsTranslator-1.8.1.jar
+includes=**
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=false
+j2ee.platform=1.7-web
+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.server.type=Tomcat
+jar.compress=false
+javac.classpath=\
+    ${reference.csip-core.jar}:\
+    ${libs.CSIP-Jersey-2.16.classpath}:\
+    ${libs.csip-geotools-15.1-2.classpath}:\
+    ${file.reference.csip-common-1.0.12.jar}:\
+    ${file.reference.csip-gis-objects-2.0.32.jar}:\
+    ${file.reference.jsr-275-1.0-beta-2.jar}:\
+    ${file.reference.csip-soilsdb-3.5.52.jar}:\
+    ${file.reference.SDMDriver-1.0.7.jar}:\
+    ${file.reference.MetaModelTools.jar}:\
+    ${file.reference.tomcat-juli.jar}:\
+    ${file.reference.WepsTranslator-1.8.1.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:deprecation
+javac.debug=true
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+project.csip-core=../csip-core
+project.license=CSIP
+reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar
+resource.dir=setup
+rest.config.type=ide
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.reference.csip-gis-objects-2.0.32.jar=../csip-gis-ogjects/src/
+source.reference.csip-soilsdb-3.5.52.jar=../csip-soilsdb/src
+source.reference.MetaModelTools.jar=tools/MetaModelTools/src
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=${war.name}
+war.name=csip-crp.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF

src/java/d/ApplicationConfig.java

@@ -51,13 +51,14 @@
     private void addRestResourceClasses(Set<Class<?>> resources) {
         resources.add(csip.ArchiveService.class);
         resources.add(csip.CatalogService.class);
-        resources.add(csip.ControlService.class);
-        resources.add(csip.DynamicPyModelDataService.class);
-        resources.add(csip.QueryService.class);
-        resources.add(csip.QueueingModelDataService.class);
-        resources.add(csip.ReportService.class);
-        resources.add(csip.UIService.class); 
-        resources.add(m.climate_wind_soil.V1_0.class);
-        resources.add(m.wepsmetadata.V1_0.class);
+    resources.add(csip.ControlService.class);
+    resources.add(csip.DynamicPyModelDataService.class);
+    resources.add(csip.QueryService.class);
+    resources.add(csip.QueueingModelDataService.class);
+    resources.add(csip.ReportService.class);
+    resources.add(csip.UIService.class);
+    resources.add(m.climate_wind_soil.V1_0.class);
+    resources.add(m.crpassessment.V1_0.class);
+    resources.add(m.wepsmetadata.V1_0.class);
     }
 }

tools/GetClimateWindSoil/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=02be9bca
-build.xml.script.CRC32=e48c373e
-build.xml.stylesheet.CRC32=8064a381@1.80.1.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=02be9bca
-nbproject/build-impl.xml.script.CRC32=1bfab953
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
+build.xml.data.CRC32=02be9bca
+build.xml.script.CRC32=e48c373e
+build.xml.stylesheet.CRC32=8064a381@1.80.1.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=02be9bca
+nbproject/build-impl.xml.script.CRC32=1bfab953
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

tools/GetLatLonCokey/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1ffd4e92
-build.xml.script.CRC32=0519043e
-build.xml.stylesheet.CRC32=8064a381@1.80.1.48
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1ffd4e92
-nbproject/build-impl.xml.script.CRC32=28ff580c
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
+build.xml.data.CRC32=1ffd4e92
+build.xml.script.CRC32=0519043e
+build.xml.stylesheet.CRC32=8064a381@1.80.1.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=1ffd4e92
+nbproject/build-impl.xml.script.CRC32=28ff580c
+nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

tools/GetWEPSArchives/nbproject/private/private.properties

@@ -1,7 +1,8 @@
-application.args=mongodb://csip.engr.colostate.edu:8095/8084_ftm_csip-weps "http://csip.engr.colostate.edu:8084/csip-weps/m/weps/5.0"
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/Users/scase/Library/Application Support/NetBeans/8.2/build.properties
+application.args=suid.txt
+compile.on.save=true
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+user.properties.file=C:\\Users\\scase.IDS-UNCOMPA\\AppData\\Roaming\\NetBeans\\8.2\\build.properties
+work.dir=E:\\NetBeansProjects\\csip-crp\\tools\\GetWEPSArchives

tools/GetWEPSArchives/nbproject/private/private.xml

@@ -1,7 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
-    </open-files>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/E:/NetBeansProjects/csip-crp/tools/GetWEPSArchives/src/getwepsarchives/GetWEPSArchives.java</file>
+            <file>file:/E:/NetBeansProjects/csip-crp/tools/GetWEPSArchives/src/getwepsarchives/ArchiveThread.java</file>
+        </group>
+    </open-files>
+</project-private>

tools/GetWEPSArchives/src/getwepsarchives/ArchiveThread.java

@@ -75,7 +75,7 @@
             }
         }
         
-        if (!errorMessage.isEmpty()) {
+        if ( (null != errorMessage) && !errorMessage.isEmpty()) {
             System.err.println(suid + ": " + errorMessage);
         }
 

tools/GetWEPSArchives/src/getwepsarchives/GetWEPSArchives.java

@@ -41,141 +41,144 @@
      * @param args the command line arguments
      */
     public static void main(String[] args) throws SQLException, Exception {
-        ServiceArchive mongoArchive;
-        String dbLocation;
-        ArrayList<ModelArchive> models = null;
+    ServiceArchive mongoArchive;
+    String dbLocation;
+    ArrayList<ModelArchive> models = null;
 
-        if (args.length >= 2) {
-            ArrayList<ModelArchive> results = null;
+    if (args.length >= 2) {
+        ArrayList<ModelArchive> results = null;
 
-            dbLocation = args[0];
-            if (dbLocation.contains("mongodb://")) {
-                mongoArchive = new MongoArchive(dbLocation);
-            } else {
-                mongoArchive = new FileArchive(dbLocation);
-            }
+        dbLocation = args[0];
+        if (dbLocation.contains("mongodb://")) {
+        mongoArchive = new MongoArchive(dbLocation);
+        } else {
+        mongoArchive = new FileArchive(dbLocation);
+        }
 
-            models = mongoArchive.getArchivesByFilter("service", args[1], -1);
+        models = mongoArchive.getArchivesByFilter("service", args[1], -1);
 
-            if (null != models) {
-                for (ModelArchive model : models) {
-                    JSONObject input = model.getOriginalRequest();
-                    JSONObject result = model.getOriginalResponse();
+        if (null != models) {
+        for (ModelArchive model : models) {
+            JSONObject input = model.getOriginalRequest();
+            JSONObject result = model.getOriginalResponse();
 
-                }
-            }
+        }
+        }
 
-            try {
-                mongoArchive.shutdown();
-            } catch (Exception ex) {
-                Logger.getLogger(GetWEPSArchives.class.getName()).log(Level.SEVERE, null, ex);
-            }
+        try {
+        mongoArchive.shutdown();
+        } catch (Exception ex) {
+        Logger.getLogger(GetWEPSArchives.class.getName()).log(Level.SEVERE, null, ex);
+        }
 
-        } else {
-            if (args.length == 1) {
-                if (args[0].contains(".txt")) {
-                    // Then we have a list of suids to fetch.
-                    ConcurrentHashMap<String, WEPSMetaData> metaDataResults = new ConcurrentHashMap<>();
+    } else {
+        if (args.length == 1) {
+        if (args[0].contains(".txt")) {
+            // Then we have a list of suids to fetch.
+            ConcurrentHashMap<String, WEPSMetaData> metaDataResults = new ConcurrentHashMap<>();
 
-                    boolean fileDone = false;
-                    int lineNumber = 0;
-                    int maxThreads = 15;
+            boolean fileDone = false;
+            int lineNumber = 0;
+            int maxThreads = 15;
 
-                    File inputFile = new File(args[0]);
-                    BufferedReader inputStream = Files.newBufferedReader(inputFile.toPath());
+            File inputFile = new File(args[0]);
+            BufferedReader inputStream = Files.newBufferedReader(inputFile.toPath());
 
-                    dbLocation = inputStream.readLine();
+            dbLocation = inputStream.readLine();
 
-                    if (null == dbLocation) {
-                        printCommandLineHelp();
-                        throw new Exception("No mongo archive db Location found in first line of text file.");
-                    }
+            if (null == dbLocation) {
+            printCommandLineHelp();
+            throw new Exception("No mongo archive db Location found in first line of text file.");
+            }
 
-                    String[] params = dbLocation.split(",");
-                    
-                    dbLocation = params[0];
-                    if (params.length > 1) {
-                        maxThreads = Integer.parseInt(params[1]);
-                    }
+            String[] params = dbLocation.split(",");
 
-                    while (!fileDone) {
-                        int count = 0;
-                        String[] suid = new String[maxThreads];
+            dbLocation = params[0];
+            if (params.length > 1) {
+            maxThreads = Integer.parseInt(params[1].trim());
+            }
 
-                        while ((count < maxThreads) && (!fileDone)) {
-                            String inLine = inputStream.readLine();
+            while (!fileDone) {
+            int count = 0;
+            String[] suid = new String[maxThreads];
 
-                            if (null != inLine) {
-                                lineNumber++;
-                                suid[count] = inLine.trim();
-                                count++;
-                            } else {
-                                fileDone = true;
-                            }
-                        }
+            while ((count < maxThreads) && (!fileDone)) {
+                String inLine = inputStream.readLine();
 
-                        CountDownLatch latch = new CountDownLatch(count);
-                        for (int i = 0; i < count; i++) {
-                            ArchiveThread archiveThread = new ArchiveThread(suid[count], dbLocation, metaDataResults, latch);
-                            archiveThread.start();
-                        }
+                if (null != inLine) {
+                lineNumber++;
+                suid[count] = inLine.trim();
+                count++;
+                } else {
+                fileDone = true;
+                }
+            }
 
-                        latch.await();
-                    }
+            CountDownLatch latch = new CountDownLatch(count);
+            for (int i = 0; i < count; i++) {
+                ArchiveThread archiveThread = new ArchiveThread(suid[i], dbLocation, metaDataResults, latch);
+                archiveThread.start();
+            }
 
-                    writeOutputResults(metaDataResults, args[0]);
-                } else {
-                    printCommandLineHelp();
-                }
-            } else {
-                printCommandLineHelp();
-            }
+            latch.await();
+            }
 
-        }
+            writeOutputResults(metaDataResults, args[0]);
+        } else {
+            printCommandLineHelp();
+        }
+        } else {
+        printCommandLineHelp();
+        }
+
+    }
     }
 
     protected static void writeOutputResults(ConcurrentHashMap<String, WEPSMetaData> metaDataResults, String fileName) throws FileNotFoundException, IOException {
-        if ((null != metaDataResults) && !metaDataResults.isEmpty()) {
+    if ((null != metaDataResults) && !metaDataResults.isEmpty()) {
 
-            FileOutputStream outFile = new FileOutputStream(fileName + ".csv");
-            BufferedWriter fileWriter = new BufferedWriter(new OutputStreamWriter(outFile));
+        FileOutputStream outFile = new FileOutputStream(fileName + ".csv");
+        BufferedWriter fileWriter = new BufferedWriter(new OutputStreamWriter(outFile));
 
-            fileWriter.write("suid, annualPrecip, windEnergy, soilWiltPoint, errosionRate" + System.lineSeparator());
-            fileWriter.flush();
+        fileWriter.write("suid, annualPrecip, windEnergy, soilWiltPoint, errosionRate, FORTRAN Messages" + System.lineSeparator());
+        fileWriter.flush();
 
-            for (String key : metaDataResults.keySet()) {
-                WEPSMetaData wepsMetaData = metaDataResults.get(key);
+        for (String key : metaDataResults.keySet()) {
+        WEPSMetaData wepsMetaData = metaDataResults.get(key);
 
-                fileWriter.write(wepsMetaData.suid() + ", " + wepsMetaData.annualPrecip()
-                        + ", " + wepsMetaData.windEnergy() + ", "
-                        + wepsMetaData.soilWiltPoint() + ", " + wepsMetaData.errosionRate());
-                fileWriter.write(System.lineSeparator());
-                fileWriter.flush();
-            }
-            fileWriter.flush();
-            outFile.flush();
-            fileWriter.close();
-            outFile.close();
-        }
+        fileWriter.write(wepsMetaData.suid() + ", " + wepsMetaData.annualPrecip()
+            + ", " + wepsMetaData.windEnergy() + ", "
+            + wepsMetaData.soilWiltPoint() + ", " + wepsMetaData.errosionRate());
+        fileWriter.write(System.lineSeparator());
+        fileWriter.flush();
+        if (!wepsMetaData.errorMessages().isEmpty()) {
+            System.err.println(System.lineSeparator() + wepsMetaData.suid() + ":" + System.lineSeparator() + wepsMetaData.errorMessages());
+        }
+        }
+        fileWriter.flush();
+        outFile.flush();
+        fileWriter.close();
+        outFile.close();
+    }
     }
 
     protected static void printCommandLineHelp() {
-        System.out.println("ERROR: No input arguments specified.\nPlease specify the URI location of the Archive to search and either the IP address to search for or a filename of a file containing a list of SUID's to search for.  The filename must end in '.txt'");
-        System.out.println("Usage:");
-        System.out.println("\tCokeyConverter <Archive URI> <[ip address] | [filename]> <new service URI>");
-        System.out.println("\t\tWhere <Archive URI> is a valid host name port number combination.");
-        System.out.println("\t\tAnd [ip address] is a valid IPv4 address");
-        System.out.println("\t\tOr [filename] points to a file that contains a list of SUID's, one per line, to search for.");
-        System.out.println("\t\t\tAdditionally, a file may contain only one SUID, and if so, then the search will be for all records containing the ip address used in the SUID specified, and found after the date of the SUID found, for the service specified for that SUID.");
+    System.out.println("ERROR: No input arguments specified.\nPlease specify the URI location of the Archive to search and either the IP address to search for or a filename of a file containing a list of SUID's to search for.  The filename must end in '.txt'");
+    System.out.println("Usage:");
+    System.out.println("\tCokeyConverter <Archive URI> <[ip address] | [filename]> <new service URI>");
+    System.out.println("\t\tWhere <Archive URI> is a valid host name port number combination.");
+    System.out.println("\t\tAnd [ip address] is a valid IPv4 address");
+    System.out.println("\t\tOr [filename] points to a file that contains a list of SUID's, one per line, to search for.");
+    System.out.println("\t\t\tAdditionally, a file may contain only one SUID, and if so, then the search will be for all records containing the ip address used in the SUID specified, and found after the date of the SUID found, for the service specified for that SUID.");
     }
 
     public static Map<String, JSONObject> preprocess(JSONArray params) throws JSONException {
-        Map<String, JSONObject> p = new HashMap<>();
-        for (int i = 0; i < params.length(); i++) {
-            JSONObject o = params.getJSONObject(i);
-            p.put(o.getString("name"), o);
-        }
-        return p;
+    Map<String, JSONObject> p = new HashMap<>();
+    for (int i = 0; i < params.length(); i++) {
+        JSONObject o = params.getJSONObject(i);
+        p.put(o.getString("name"), o);
+    }
+    return p;
     }
 
 }

tools/MetaModelTools/nbproject/private/private.properties

@@ -1,6 +1,6 @@
-compile.on.save=true
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-user.properties.file=/Users/scase/Library/Application Support/NetBeans/8.2/build.properties
+compile.on.save=true
+do.depend=false
+do.jar=true
+javac.debug=true
+javadoc.preview=true
+user.properties.file=C:\\Users\\scase.IDS-UNCOMPA\\AppData\\Roaming\\NetBeans\\8.2\\build.properties

tools/MetaModelTools/nbproject/private/private.xml

@@ -1,4 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group>
+            <file>file:/E:/NetBeansProjects/csip-crp/tools/MetaModelTools/src/models/ModelArchive.java</file>
+            <file>file:/E:/NetBeansProjects/csip-crp/tools/MetaModelTools/src/models/WEPSModelArchive.java</file>
+            <file>file:/E:/NetBeansProjects/csip-crp/tools/MetaModelTools/src/archives/MongoArchive.java</file>
+        </group>
+    </open-files>
+</project-private>

tools/MetaModelTools/src/models/ModelArchiveFactory.java

@@ -16,7 +16,7 @@
     public static ModelArchive getModelArchive(String serviceName, Document doc) {
         ModelArchive model = null;
 
-        if (serviceName.contains("weps/5.0")) {
+        if (serviceName.contains("weps/5.2")) {
             model = new WEPSModelArchive(doc.getString("_id"),
                     doc.getString("ctime"),
                     doc.getString("etime"),

tools/MetaModelTools/src/models/WEPSModelArchive.java

@@ -78,13 +78,13 @@
             }
         }
 
-        try {
-            management = getManagementFile(fileData);
-        } catch (IOException ex) {
-            badModelRun = true;
-            badModelMessage += "##\n";
-            badModelMessage += ex.getMessage();
-        }
+//        try {
+//            management = getManagementFile(fileData);
+//        } catch (IOException ex) {
+//            badModelRun = true;
+//            badModelMessage += "##\n";
+//            badModelMessage += ex.getMessage();
+//        }
 
         try {
             windData = getWindDataFile(fileData);
@@ -208,6 +208,8 @@
             badModelMessage += "##\n";
             badModelMessage += "Missing wind_eros result in WEPS output result file.";
         }
+    
+    wepsMetaData.errorMessages(badModelMessage);
 
     }
 
@@ -264,7 +266,7 @@
             ZipEntry entry;
 
             while ((entry = zin.getNextEntry()) != null) {
-                if (entry.getName().contains("weps.exe") && entry.getName().contains("stderr.txt")) {
+                if (entry.getName().contains("weps.") && entry.getName().contains("stderr.txt")) {
                     BufferedReader bReader = new BufferedReader(new InputStreamReader(zin));
                     StringBuilder fileContent = new StringBuilder();
                     String inputStr;
@@ -317,7 +319,16 @@
         private double surfRockFrag;
         private double errosionRate;
         private String suid;
+    private String errorMessages = "";
 
+    public String errorMessages(){
+        return errorMessages;
+    }
+    
+    public void errorMessages(String value){
+        errorMessages = value;
+    }
+    
         public String suid() {
             return suid;
         }