nbproject/build-impl.xml
| @@ -1017,6 +1017,7 @@ |
| <copyfiles files="${file.reference.MetaModelTools.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.tomcat-juli.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.WepsTranslator-1.8.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.encog-core-3.4.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> |
| @@ -1032,6 +1033,7 @@ |
| <copyfiles files="${file.reference.MetaModelTools.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.tomcat-juli.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.WepsTranslator-1.8.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.encog-core-3.4.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.77.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=d237478b |
| -nbproject/build-impl.xml.script.CRC32=379cca6e |
| +nbproject/build-impl.xml.data.CRC32=91d2c9f5 |
| +nbproject/build-impl.xml.script.CRC32=0988e12d |
| nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
| nbproject/rest-build.xml.data.CRC32=71dc8180 |
| nbproject/rest-build.xml.script.CRC32=3cafac24 |
nbproject/project.properties
| @@ -38,6 +38,7 @@ |
| 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.encog-core-3.4.jar=lib/encog-core-3.4.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 |
| @@ -48,7 +49,7 @@ |
| 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.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 |
| j2ee.server.type=Tomcat |
| jar.compress=false |
| javac.classpath=\ |
| @@ -62,7 +63,8 @@ |
| ${file.reference.SDMDriver-1.0.7.jar}:\ |
| ${file.reference.MetaModelTools.jar}:\ |
| ${file.reference.tomcat-juli.jar}:\ |
| - ${file.reference.WepsTranslator-1.8.1.jar} |
| + ${file.reference.WepsTranslator-1.8.1.jar}:\ |
| + ${file.reference.encog-core-3.4.jar} |
| # Space-separated list of extra javac options |
| javac.compilerargs=-Xlint:deprecation |
| javac.debug=true |
nbproject/project.xml
| @@ -53,6 +53,10 @@ |
| <file>${file.reference.WepsTranslator-1.8.1.jar}</file> |
| <path-in-war>WEB-INF/lib</path-in-war> |
| </library> |
| + <library dirs="200"> |
| + <file>${file.reference.encog-core-3.4.jar}</file> |
| + <path-in-war>WEB-INF/lib</path-in-war> |
| + </library> |
| </web-module-libraries> |
| <web-module-additional-libraries/> |
| <source-roots> |
src/java/m/crp/ApplicationConfig.java
| @@ -60,6 +60,7 @@ |
| resources.add(csip.UIService.class); |
| resources.add(m.crp.assessmenttool.V1_0.class); |
| resources.add(m.crp.climate_wind_soil.V1_0.class); |
| + resources.add(m.crp.smweps.V1_0.class); |
| resources.add(m.crp.wepsmetadata.V1_0.class); |
| } |
| } |
src/java/m/crp/climate_wind_soil/V1_0.java
| @@ -29,12 +29,12 @@ |
| import java.io.IOException; |
| import java.sql.Connection; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.Description; |
| -import oms3.annotations.Name; |
| import org.codehaus.jettison.json.JSONObject; |
| import crp.utils.Climate; |
| import crp.utils.FPPSoilParams; |
| import crp.utils.WindGen; |
| +import csip.annotations.Description; |
| +import csip.annotations.Name; |
| import soils.db.DBResources; |
| |
| /** |