deploy/8083d/conf.sh
| @@ -1,2 +1,2 @@ |
| action=deploy |
| -version=1.0.8-2.1.101 |
| +version=1.0.14-2.1.114 |
nbproject/project.properties
| @@ -140,7 +140,7 @@ |
| j2ee.copy.static.files.on.save=true |
| j2ee.deploy.on.save=false |
| j2ee.platform=1.6-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.3.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/sqljdbc4.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.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=true |
| javac.classpath=\ |
| @@ -277,7 +277,7 @@ |
| javadoc.windowtitle= |
| lib.dir=${web.docbase.dir}/WEB-INF/lib |
| persistence.xml.dir=${conf.dir} |
| -platform.active=JDK_1.8 |
| +platform.active=default_platform |
| project.csip-core=../csip-core |
| reference.csip-core.jar=${project.csip-core}/dist/csip-core.jar |
| resource.dir=setup |
web/META-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 1.0.11 6cf31d14c8b5 2016-09-26 Jakob23, built at 2016-09-30 12:47 by od$", |
| + "csip-erosion.version": "$version: 1.0.14 35013fa03d75 2016-09-30 od, built at 2016-10-04 12:21 by od$", |
| "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", |
web/WEB-INF/csip-conf.json
| @@ -1,5 +1,5 @@ |
| { |
| - "csip-erosion.version": "$version: 1.0.11 6cf31d14c8b5 2016-09-26 Jakob23, built at 2016-09-30 12:47 by od$", |
| + "csip-erosion.version": "$version: 1.0.14 35013fa03d75 2016-09-30 od, built at 2016-10-04 12:21 by od$", |
| "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", |