Displaying differences for changeset
 
display as  

src/java/m/wqm/ApplicationConfig.java

@@ -34,11 +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.wqm.NutrientSLP.V1_0.class);
         resources.add(m.wqm.nutappmgtscores.V1_0.class);
-        resources.add(m.wqm.nutrientslpsrp.V1_0.class);
         resources.add(m.wqm.nuttechscores.V1_0.class);
         resources.add(m.wqm.pesthazrating.V1_0.class);
         resources.add(m.wqm.pesticide.attributes.V1_0.class);
@@ -48,14 +48,15 @@
         resources.add(m.wqm.pestlosspot.V1_0.class);
         resources.add(m.wqm.pestpractscores.V1_0.class);
         resources.add(m.wqm.pesttechnscores.V1_0.class);
-        resources.add(m.wqm.rfactor.V1_0.class);
+        resources.add(m.wqm.nutrientslpsrp.V1_0.class); 
         resources.add(m.wqm.scorebar.V1_0.class);
         resources.add(m.wqm.scpestslp.V1_0.class);
-        resources.add(m.wqm.scsednutsrp.V1_0.class);
         resources.add(m.wqm.sednutpractscores.V1_0.class);
         resources.add(m.wqm.soilpestlosspot.V1_0.class);
         resources.add(m.wqm.thresholdscores.V1_0.class);
+        resources.add(m.wqm.wqsr.V1_0.class);
+        resources.add(m.wqm.rfactor.V1_0.class);
+        resources.add(m.wqm.scsednutsrp.V1_0.class);
         resources.add(m.wqm.wqmsoilattributes.V1_0.class);
-    resources.add(m.wqm.wqsr.V1_0.class);
     }
 }

src/java/m/wqm/wqmsoilattributes/V1_0.java

@@ -71,7 +71,12 @@
             String confString = Config.getString("rse-db","ssurgo");    
         if ( confString.contains( "rse-sql" ) ){
             this.useMSSQL = true;
+                    LOG.info("Using MS SQL database.");
         }
+                else
+                {
+                    LOG.info("Using PostgreSQL database.");
+                }
         
         JSONArray features = getJSONParam("aoa_geometry").optJSONArray("features");
         if (this.buildPolygon(features)) {

web/META-INF/csip-conf.json

@@ -4,14 +4,14 @@
   "csip.logging.enabled"  : false,
   "debugging"   : false,
   "rse-db": "rse-sql", 
-  "rse-sql.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=sa;password=csurams#1",  
+  "rse-sql.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=rset-r;password=cs1prs3t",  
   "wqm.debug.db": "jdbc:postgresql://localhost:5432/wqm?user=postgres&password=admin",
   "ssurgo.debug.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/ssurgo?user=postgres&password=admin", 
   "r2gis.debug.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/r2gis?user=postgres&password=admin", 
   "wqm.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/wqm?user=postgres&password=admin",  
   "ssurgo.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/ssurgo?user=postgres&password=admin", 
   "r2gis.db": "jdbc:postgresql://csip.engr.colostate.edu:5435/r2gis?user=postgres&password=admin", 
-  "mssql-ssurgo.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=sa;password=csurams#1",
+  "mssql-ssurgo.db": "jdbc:sqlserver:\/\/129.82.20.241:1433;databaseName=ssurgo;user=rset-r;password=cs1prs3t",
   "mssql-ssurgo.db.driver":"com.microsoft.sqlserver.jdbc.SQLServerDriver",
   "rse-sql.db.driver":"com.microsoft.sqlserver.jdbc.SQLServerDriver",
   "r2gis.db.driver":"org.postgresql.Driver",