@@ -86,6 +86,6 @@ |
"csip.logging.mongodb.uri": "mongodb://localhost:27017/csip", |
"csip.logging.keepsevere": "false", |
"csip.accesslog.backend": "postgres", |
- "csip.accesslog.enabled": "true", |
+ "csip.accesslog.enabled": "false", |
"csip.accesslog.postgres.url": "jdbc:postgresql://192.168.10.110:5432/csiplog?user=postgres" |
} |
\ No newline at end of file |
@@ -86,6 +86,6 @@ |
"csip.logging.mongodb.uri": "mongodb://localhost:27017/csip", |
"csip.logging.keepsevere": "false", |
"csip.accesslog.backend": "postgres", |
- "csip.accesslog.enabled": "true", |
+ "csip.accesslog.enabled": "false", |
"csip.accesslog.postgres.url": "jdbc:postgresql://192.168.10.110:5432/csiplog?user=postgres" |
} |
\ No newline at end of file |
@@ -5,20 +5,21 @@ |
"pg.url": "jdbc:postgresql://csip.engr.colostate.edu:5435/r2gis", |
"r2.db": "http://csip.engr.colostate.edu/r2", |
"weps.db": "http://csip.engr.colostate.edu/weps", |
+ "conservation_resoucres.database": "pg", |
"csip.session.redis.port": "6379", |
"csip.session.redis.server": "172.1.6.12", |
"csip.session.mongodb.uri": "mongodb://localhost:27017/csip", |
"csip.session.backend": "mongodb", |
"csip.session.ttl": "PT300S", |
"csip.session.ttl.failed": "PT3000S", |
- "csip.archive.enabled" : "true", |
+ "csip.archive.enabled" : "true", |
"csip.archive.backend": "mongodb", |
"csip.archive.mongodb.uri": "mongodb://localhost:27017/csip", |
"csip.archive.ttl": "P7D", |
- "csip.logging.enabled" : "true", |
+ "csip.logging.enabled" : "true", |
"csip.logging.backend": "mongodb", |
"csip.logging.level": "INFO", |
"csip.logging.mongodb.uri": "mongodb://localhost:27017/csip", |
"csip.logging.keepsevere": "false", |
- "csip.timezone": "MST7MDT", |
+ "csip.timezone": "MST7MDT" |
} |
@@ -1035,9 +1035,9 @@ |
<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.Lmod2Rusle2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
- <copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.Man2Weps.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
+ <copyfiles files="${file.reference.WepsReportData.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
<copyfiles files="${file.reference.javax.inject.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
@@ -1143,9 +1143,9 @@ |
<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.Lmod2Rusle2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
- <copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.Man2Weps.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
+ <copyfiles files="${file.reference.WepsReportData.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.jsf-impl.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.postgresql-9.0-801.jdbc4.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
<copyfiles files="${file.reference.javax.inject.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
@@ -1,5 +1,5 @@ |
{ |
- "csip-erosion.version": "$version: 0.2.128 e3120eb4754f 2016-08-11 Shaun Case, built at 2016-08-11 11:34 by brad$", |
+ "csip-erosion.version": "$version: 0.2.124 0034fc8ac898 2016-08-09 Jakob23, built at 2016-08-10 08:45 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", |
@@ -1,5 +1,5 @@ |
{ |
- "csip-erosion.version": "$version: 0.0.0 xxxxxxx date, built at 2016-07-22 09:36 by Lucas Yaege$", |
+ "csip-erosion.version": "$version: 0.2.128 e3120eb4754f 2016-08-11 Shaun Case, built at 2016-08-11 11:34 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", |