# HG changeset patch # User mike@uapl02 # Date 1509280543 -3600 # Node ID acf54d3fa1d1940a5ee45f18d322bcf78c6c8834 # Parent fcb4525781425f5725a4cd08d5b180835e813ea7 switched to tomcat 8.5 (should be developed this way for maximum compatibility) diff -r fcb452578142 -r acf54d3fa1d1 .hgignore --- a/.hgignore Thu Apr 06 17:44:17 2017 +0200 +++ b/.hgignore Sun Oct 29 13:35:43 2017 +0100 @@ -1,3 +1,8 @@ syntax: regexp ^nbproject/private/ ^build/ +\.orig\..*$ +\.orig$ +\.chg\..*$ +\.rej$ +\.conflict\~$ diff -r fcb452578142 -r acf54d3fa1d1 nbproject/ant-deploy.xml --- a/nbproject/ant-deploy.xml Thu Apr 06 17:44:17 2017 +0200 +++ b/nbproject/ant-deploy.xml Sun Oct 29 13:35:43 2017 +0100 @@ -1,111 +1,76 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + diff -r fcb452578142 -r acf54d3fa1d1 nbproject/genfiles.properties --- a/nbproject/genfiles.properties Thu Apr 06 17:44:17 2017 +0200 +++ b/nbproject/genfiles.properties Sun Oct 29 13:35:43 2017 +0100 @@ -1,8 +1,8 @@ -build.xml.data.CRC32=6b6de059 +build.xml.data.CRC32=526d7b6b build.xml.script.CRC32=1f023e98 -build.xml.stylesheet.CRC32=651128d4@1.75.1.1 +build.xml.stylesheet.CRC32=651128d4@1.77.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=6b6de059 +nbproject/build-impl.xml.data.CRC32=526d7b6b nbproject/build-impl.xml.script.CRC32=3fd540ea -nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 +nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 diff -r fcb452578142 -r acf54d3fa1d1 nbproject/project.properties --- a/nbproject/project.properties Thu Apr 06 17:44:17 2017 +0200 +++ b/nbproject/project.properties Sun Oct 29 13:35:43 2017 +0100 @@ -33,13 +33,8 @@ j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7-web -j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar -j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar -j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar -j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar -j2ee.platform.wsit.classpath= -j2ee.server.type=gfv3ee6 +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.6.3.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/jaspic-api.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-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=false javac.classpath= # Space-separated list of extra javac options @@ -68,7 +63,6 @@ javadoc.version=false javadoc.windowtitle= lib.dir=${web.docbase.dir}/WEB-INF/lib -no.dependencies=false persistence.xml.dir=${conf.dir} platform.active=default_platform resource.dir=setup diff -r fcb452578142 -r acf54d3fa1d1 nbproject/project.xml --- a/nbproject/project.xml Thu Apr 06 17:44:17 2017 +0200 +++ b/nbproject/project.xml Sun Oct 29 13:35:43 2017 +0100 @@ -8,10 +8,10 @@ - + - + diff -r fcb452578142 -r acf54d3fa1d1 web/META-INF/context.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/META-INF/context.xml Sun Oct 29 13:35:43 2017 +0100 @@ -0,0 +1,2 @@ + +