changeset
switched to tomcat 8.5 (should be developed this way for maximum compatibility)
Sun, 29 Oct 2017 13:35:43 +0100
- author
- mike@uapl02
- date
- Sun, 29 Oct 2017 13:35:43 +0100
- changeset 3
- acf54d3fa1d1
- parent 2
- fcb452578142
- child 4
- a89240b61819
switched to tomcat 8.5 (should be developed this way for maximum compatibility)
--- 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\~$
--- 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 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + +Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. + +Oracle and Java are registered trademarks of Oracle and/or its affiliates. +Other names may be trademarks of their respective owners. + +The contents of this file are subject to the terms of either the GNU +General Public License Version 2 only ("GPL") or the Common +Development and Distribution License("CDDL") (collectively, the +"License"). You may not use this file except in compliance with the +License. You can obtain a copy of the License at +http://www.netbeans.org/cddl-gplv2.html +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +specific language governing permissions and limitations under the +License. When distributing the software, include this License Header +Notice in each file and include the License file at +nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this +particular file as subject to the "Classpath" exception as provided +by Oracle in the GPL Version 2 section of the License file that +accompanied this code. If applicable, add the following below the +License Header, with the fields enclosed by brackets [] replaced by +your own identifying information: +"Portions Copyrighted [year] [name of copyright owner]" + +If you wish your version of this file to be governed by only the CDDL +or only the GPL Version 2, indicate your decision by adding +"[Contributor] elects to include this software in this distribution +under the [CDDL or GPL Version 2] license." If you do not indicate a +single choice of license, a recipient has the option to distribute +your version of this file under either the CDDL, the GPL Version 2 or +to extend the choice of license to its licensees as provided above. +However, if you add GPL Version 2 code and therefore, elected the GPL +Version 2 license, then the option applies only if the new code is +made subject to such option by the copyright holder. + +Contributor(s): +--> <project default="-deploy-ant" basedir="."> - <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> - <property file="${deploy.ant.properties.file}" /> - <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/> - <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/> - <available file="${deploy.ant.resource.dir}" property="has.setup"/> - <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> - <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/> - </target> - - <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present"> - <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/> - <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/> - <!-- The doctype triggers resolution which can fail --> - <replace file="${temp.sun.web}"> - <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken> - <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue> - </replace> - <replace file="${temp.sun.web}"> - <replacetoken><![CDATA[<sun-web-app]]></replacetoken> - <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue> - </replace> - <xmlproperty file="${temp.sun.web}" validate="false"> - </xmlproperty> - <delete file="${temp.sun.web}"/> - <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}"> - <isset property="sun-web-app.context-root"/> - </condition> - <condition property="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}" else="/${ant.project.name}"> - <isset property="sun-web-app.context-root"/> - </condition> - </target> - <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present"> - <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/> - <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/> - <!-- The doctype triggers resolution which can fail --> - <replace file="${temp.gf.web}"> - <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken> - <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue> - </replace> - <replace file="${temp.gf.web}"> - <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken> - <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue> - </replace> - <xmlproperty file="${temp.gf.web}" validate="false"> - </xmlproperty> - <delete file="${temp.gf.web}"/> - <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}"> - <isset property="glassfish-web-app.context-root"/> - </condition> - <condition property="deploy.context.root.argument" value="&contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}"> - <isset property="glassfish-web-app.context-root"/> - </condition> + <target name="-init" if="deploy.ant.enabled"> + <property file="${deploy.ant.properties.file}"/> + <tempfile property="temp.module.folder" prefix="tomcat" destdir="${java.io.tmpdir}"/> + <unwar src="${deploy.ant.archive}" dest="${temp.module.folder}"> + <patternset includes="META-INF/context.xml"/> + </unwar> + <xmlproperty file="${temp.module.folder}/META-INF/context.xml"/> + <delete dir="${temp.module.folder}"/> </target> - <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present"> - <property name="deploy.context.root.argument" value=""/> - </target> - <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup"> - <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/> - <mkdir dir="${gfv3.resources.dir}"/> - <mkdir dir="${gfv3.resources.dir}/META-INF"/> - <copy todir="${gfv3.resources.dir}/META-INF"> - <fileset dir="${deploy.ant.resource.dir}"/> - </copy> - <jar destfile="${deploy.ant.archive}" update="true"> - <fileset dir="${gfv3.resources.dir}"/> - </jar> - <delete dir="${gfv3.resources.dir}"/> - </target> - <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled"> - <antcall target="-deploy-without-pw"/> - <antcall target="-deploy-with-pw"/> + <target name="-check-credentials" if="deploy.ant.enabled" depends="-init"> + <fail message="Tomcat password has to be passed as tomcat.password property."> + <condition> + <not> + <isset property="tomcat.password"/> + </not> + </condition> + </fail> </target> - - <target name="-deploy-without-pw" unless="gfv3.password"> - <echo message="Deploying ${deploy.ant.archive}"/> - <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> - <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/> - <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}" - dest="${gfv3.results.file}"/> - <delete file="${gfv3.results.file}"/> - </target> - <target name="-deploy-with-pw" if="gfv3.password"> - <echo message="Deploying ${deploy.ant.archive}"/> - <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> - <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/> - <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}" - dest="${gfv3.results.file}"/> - <delete file="${gfv3.results.file}"/> + <target name="-deploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> + <echo message="Deploying ${deploy.ant.archive} to ${Context(path)}"/> + <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" + classpath="${tomcat.home}/server/lib/catalina-ant.jar"/> + <deploy url="${tomcat.url}/manager" username="${tomcat.username}" + password="${tomcat.password}" path="${Context(path)}" + war="${deploy.ant.archive}"/> + <property name="deploy.ant.client.url" value="${tomcat.url}${Context(path)}"/> </target> - <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled"> - <antcall target="-undeploy-without-pw"/> - <antcall target="-undeploy-with-pw"/> - </target> - - <target name="-undeploy-without-pw" unless="gfv3.password"> - <echo message="Undeploying ${deploy.ant.archive}"/> - <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> - <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}" - dest="${gfv3.results.file}"/> - <delete file="${gfv3.results.file}"/> - </target> - <target name="-undeploy-with-pw" if="gfv3.password"> - <echo message="Undeploying ${deploy.ant.archive}"/> - <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> - <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}" - dest="${gfv3.results.file}"/> - <delete file="${gfv3.results.file}"/> + <target name="-undeploy-ant" if="deploy.ant.enabled" depends="-init,-check-credentials"> + <echo message="Undeploying ${Context(path)}"/> + <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" + classpath="${tomcat.home}/server/lib/catalina-ant.jar"/> + <undeploy url="${tomcat.url}/manager" username="${tomcat.username}" + password="${tomcat.password}" path="${Context(path)}"/> </target> </project>
--- 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
--- 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
--- 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 @@ <web-module-libraries/> <web-module-additional-libraries/> <source-roots> - <root id="src.dir" name="Source Packages"/> + <root id="src.dir"/> </source-roots> <test-roots> - <root id="test.src.dir" name="Test Packages"/> + <root id="test.src.dir"/> </test-roots> </data> </configuration>
