nbproject/build-impl.xml
| @@ -1035,6 +1035,7 @@ |
| <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.postgresql-9.4-1201-jdbc41.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.sqljdbc4.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> |
| @@ -1042,6 +1043,7 @@ |
| <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.postgresql-9.4-1201-jdbc41.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.sqljdbc4.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/genfiles.properties
| @@ -3,8 +3,8 @@ |
| build.xml.stylesheet.CRC32=651128d4@1.65.1.1 |
| # 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=1f7a6d28 |
| -nbproject/build-impl.xml.script.CRC32=3d75ab86 |
| +nbproject/build-impl.xml.data.CRC32=3bb6f2b2 |
| +nbproject/build-impl.xml.script.CRC32=172cc66e |
| nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.67.1.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
nbproject/project.properties
| @@ -34,6 +34,7 @@ |
| ${libs.javaee-endorsed-api-6.0.classpath} |
| excludes= |
| file.reference.postgresql-9.4-1201-jdbc41.jar=lib/postgresql-9.4-1201-jdbc41.jar |
| +file.reference.sqljdbc4.jar=lib/sqljdbc4.jar |
| includes=** |
| j2ee.compile.on.save=false |
| j2ee.copy.static.files.on.save=false |
| @@ -45,7 +46,8 @@ |
| javac.classpath=\ |
| ${libs.CSIP-Jersey-2.16.classpath}:\ |
| ${reference.csip-core.jar}:\ |
| - ${file.reference.postgresql-9.4-1201-jdbc41.jar} |
| + ${file.reference.postgresql-9.4-1201-jdbc41.jar}:\ |
| + ${file.reference.sqljdbc4.jar} |
| # Space-separated list of extra javac options |
| javac.compilerargs= |
| javac.debug=true |
nbproject/project.xml
| @@ -24,6 +24,10 @@ |
| <file>${file.reference.postgresql-9.4-1201-jdbc41.jar}</file> |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| + <library dirs="200"> |
| + <file>${file.reference.sqljdbc4.jar}</file> |
| + <path-in-war>WEB-INF/lib</path-in-war> |
| + </library> |
| </web-module-libraries> |
| <web-module-additional-libraries/> |
| <source-roots> |
src/java/m/rse/ApplicationConfig.java
| @@ -34,10 +34,11 @@ |
| resources.add(csip.ArchiveService.class); |
| resources.add(csip.CatalogService.class); |
| resources.add(csip.ControlService.class); |
| + resources.add(csip.ModelDataService.class); |
| resources.add(csip.QueryService.class); |
| resources.add(csip.ReportService.class); |
| resources.add(m.rse.cfactor.V1_0.class); |
| - resources.add(m.rse.wepot.V1_0.class); |
| - resources.add(m.rse.wepot.V1_1.class); |
| + resources.add(m.rse.wepot.V1_0.class); |
| + resources.add(m.rse.wepot.V1_1.class); |
| } |
| } |
src/java/m/rse/cfactor/utils/Const.java
| @@ -18,5 +18,8 @@ |
| public static final String SERVICE_DESC = "Climatic erosivity reflecting wind speed and surface soil moisture; value 100 at Garden City, Kansas"; |
| public static final double ALASKA_MIN_LATITUDE = 50.00; |
| public static final double UNKNOWN_CFACTOR = -9999.99; |
| + |
| + public static final String RSE_DEPLOYMENT_WINDOWS = "windows"; |
| + public static final String RSE_DEPLOYMENT_LINUX = "linux"; |
| |
| } |
src/java/m/rse/cfactor/utils/PGTools.java
| @@ -18,6 +18,7 @@ |
| import java.util.logging.Logger; |
| import javax.sql.DataSource; |
| import java.util.ArrayList; |
| +import static m.rse.cfactor.utils.Const.RSE_DEPLOYMENT_LINUX; |
| import oms3.util.ProcessComponent; |
| import org.apache.tomcat.jdbc.pool.DataSourceProxy; |
| import org.apache.tomcat.jdbc.pool.PoolProperties; |
| @@ -328,6 +329,8 @@ |
| ProcessComponent pc = new ProcessComponent(); |
| |
| String dataDir = Config.getString("m.data.dir", "/tmp/csip-rse/data/"); |
| + String gdal = Config.getString("gdal.deployment",RSE_DEPLOYMENT_LINUX); |
| + String gdalwinpath = Config.getString("gdalwinpath","C:\\Program Files\\GDAL\\"); |
| |
| // linux based WEPS |
| //pc.exe = |
| @@ -336,7 +339,7 @@ |
| Binaries.unpackResourceAbsolute("/us_cvalues_topo2ras_masked.tif.aux.xml", dataDir + "us_cvalues_topo2ras_masked.tif.aux.xml").toString(); |
| logger.info("geotiff=" + tifptr); |
| |
| - pc.exe = "gdallocationinfo"; |
| + pc.exe = (gdal.equals(Const.RSE_DEPLOYMENT_WINDOWS) ? gdalwinpath : "") + "gdallocationinfo"; |
| pc.args = new String[]{tifptr, slon, slat, "-wgs84"}; |
| File workDir = workspacedirectory; |
| String sessionWorkDir = workDir.toString(); |
web/META-INF/csip-conf.json
| @@ -2,6 +2,8 @@ |
| "csip.archive.enabled": false, |
| "csip.logging.enabled": false, |
| "csip.session.backend": "local", |
| + "gdal.deployment": "windows", |
| + "gdalwinpath": "C:\\Program Files\\GDAL\\", |
| "cfactor.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=sa;password=csurams#1", |
| "legacy.cfactor.db": "jdbc:sqlserver:\/\/129.82.20.244:1433;databaseName=csip_rse;user=sa;password=csurams#1", |
| "ssurgo.db":"jdbc:postgresql://csip.engr.colostate.edu:5435/ssurgo", |