Displaying differences for changeset
 
display as  

src/java/m/rhem/rhem02_getclimatestations/V1_0.java

@@ -54,7 +54,7 @@
 
     @Override
     public void doProcess() throws ServiceException {
-        try (Connection connection = getResourceJDBC(DBResources.MSSQL_SSURGO);
+        try (Connection connection = getResourceJDBC(DBResources.MSSQL_RHEM);
                 Statement statement = connection.createStatement();) {
 
             String query = "SELECT state_name, latitude, longitude, zoom "

src/java/m/rhem/rhem03_compEsd/V1_0.java

@@ -64,7 +64,7 @@
 
     @Override
     public void doProcess() throws ServiceException {
-        try (Connection connection = getResourceJDBC(DBResources.MSSQL_SSURGO);) {
+        try (Connection connection = getResourceJDBC(DBResources.MSSQL_RHEM);) {
             this.getMapunitValues(connection);
             this.getComponentValues(connection);
             this.getSurfaceTextureClass(connection);

src/java/m/rhem/rhem06_surfacetextureclasses/V1_0.java

@@ -22,7 +22,7 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import rhem.utils.DBResources;
-import static rhem.utils.DBResources.MSSQL_SSURGO;
+import static rhem.utils.DBResources.MSSQL_RHEM;
 
 /**
  * @version 1.0
@@ -45,7 +45,7 @@
 
     @Override
     public void doProcess() throws ServiceException, ClassNotFoundException {
-        try (Connection connection = getResourceJDBC(MSSQL_SSURGO);
+        try (Connection connection = getResourceJDBC(MSSQL_RHEM);
                 Statement statement = connection.createStatement();) {
             String query = "SELECT text_id, text_abreviation, text_label "
                     + "FROM rhem.d_rhem_text_lookup "

src/java/m/rhem/rhem07_slopeShapes/V1_0.java

@@ -22,7 +22,7 @@
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import rhem.utils.DBResources;
-import static rhem.utils.DBResources.MSSQL_SSURGO;
+import static rhem.utils.DBResources.MSSQL_RHEM;
 
 /**
  * @version 1.0
@@ -46,7 +46,7 @@
     @Override
     public void doProcess() throws ServiceException {
 
-        try (Connection conn = getResourceJDBC(MSSQL_SSURGO);
+        try (Connection conn = getResourceJDBC(MSSQL_RHEM);
                 Statement statement = conn.createStatement();) {
             String query = "SELECT choice_id, choice_label "
                     + "FROM rhem.d_rhem_slope_shape "

src/java/rhem/utils/DBResources.java

@@ -9,7 +9,7 @@
 import static csip.annotations.ResourceType.JDBC;
 import static rhem.utils.DBResources.*;
 
-@Resource(type = JDBC, file = "${mssql-ssurgo.db}", id = MSSQL_SSURGO, env = {
+@Resource(type = JDBC, file = "${mssql-rhem.db}", id = MSSQL_RHEM, env = {
     "removeAbandoned=false", "defaultReadOnly=true", "defaultAutoCommit=false",
     "jdbcInterceptors=org.apache.tomcat.jdbc.pool.interceptor.ConnectionState;"
     + "org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer;"
@@ -23,6 +23,6 @@
 })
 
 public interface DBResources {
-    static final String MSSQL_SSURGO = "mssql-ssurgo";
+    static final String MSSQL_RHEM = "mssql-rhem";
     static final String MSSQL_ESD = "mssql-esd";
 }

web/META-INF/csip-conf.json

@@ -1,5 +1,9 @@
 {
     "csip.archive.max.filesize": "1KB",
-    "mssql-ssurgo.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1",
-    "mssql-esd.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=esd;user=sa;password=csurams#1"
+    "mssql-rhem.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=conservation_resources;user=sa;password=csurams#1",
+    "mssql-esd.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=esd;user=sa;password=csurams#1",
+    "wine.path":"/usr/local/bin/wine",
+    "csip.session.backend":"mongodb",
+    "csip.session.ttl": "PT300S",
+    "csip.session.ttl.failed": "PT3000S"
 }