src/java/m/rusle2/V2_0_1.java
| @@ -41,6 +41,7 @@ |
| import csip.utils.JSONUtils; |
| import csip.utils.Services; |
| import java.io.IOException; |
| +import java.io.StringReader; |
| import java.util.logging.Level; |
| import javax.ws.rs.Path; |
| import javax.xml.parsers.DocumentBuilder; |
| @@ -54,6 +55,8 @@ |
| import oms3.annotations.Description; |
| import oms3.annotations.Name; |
| import oms3.annotations.VersionInfo; |
| +import org.xml.sax.EntityResolver; |
| +import org.xml.sax.InputSource; |
| import org.xml.sax.SAXException; |
| |
| /** |
| @@ -1123,6 +1126,16 @@ |
| DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); |
| DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder(); |
| |
| + documentBuilder.setEntityResolver(new EntityResolver() { |
| + |
| + @Override |
| + public InputSource resolveEntity(String publicId, String systemId) |
| + throws SAXException, IOException { |
| + System.out.println("Ignoring " + publicId + ", " + systemId); |
| + return new InputSource(new StringReader("")); |
| + } |
| + }); |
| + |
| Document document = documentBuilder.parse(soilFile); |
| |
| path = document.getElementsByTagName("Filename").item(0).getTextContent(); |
web/META-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-10-10 12:36 by Brad$", |
| + "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-10-10 14:00 by Brad$", |
| "weps.version" : "1.3.9", |
| "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
| "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |
| @@ -19,5 +19,6 @@ |
| "csip.logging.keepsevere": "false", |
| "csip.accesslog.backend": "none", |
| "csip.accesslog.postgres.url": "jdbc:postgresql://192.168.10.110:5432/csiplog?user=postgres", |
| - "csip.timezone": "MST7MDT" |
| + "csip.timezone": "MST7MDT", |
| + "sdmONLINE":"true" |
| } |
web/WEB-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-10-10 12:36 by Brad$", |
| + "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-10-10 14:00 by Brad$", |
| "weps.version" : "1.3.9", |
| "lmod.db": "jdbc:sqlserver:\/\/129.82.20.242:1433;databaseName=lmod_zedx;user=lmod-rw;password=managements", |
| "conservation_resources.db": "jdbc:sqlserver://129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1", |