| @@ -2,7 +2,7 @@ |
| <!-- |
| DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
| |
| -Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved. |
| +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. |
| @@ -59,30 +59,18 @@ |
| </target> |
| <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> |
| - <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> |
| - <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> |
| - <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> |
| - <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> |
| - </classpath> |
| - </taskdef> |
| - <deploy url="${tomcat.url}/manager/text" username="${tomcat.username}" |
| + <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" if="deploy.ant.enabled" depends="-init,-check-credentials"> |
| <echo message="Undeploying ${Context(path)}"/> |
| - <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"> |
| - <classpath> |
| - <pathelement path="${tomcat.home}/lib/catalina-ant.jar"/> |
| - <pathelement path="${tomcat.home}/lib/tomcat-coyote.jar"/> |
| - <pathelement path="${tomcat.home}/lib/tomcat-util.jar"/> |
| - <pathelement path="${tomcat.home}/bin/tomcat-juli.jar"/> |
| - </classpath> |
| - </taskdef> |
| - <undeploy url="${tomcat.url}/manager/text" username="${tomcat.username}" |
| + <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> |
| @@ -1014,16 +1014,16 @@ |
| <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest"> |
| <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${reference.csip-gis-objects.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${libs.csip-jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| - <copyfiles files="${libs.CSIP-GeoTools.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${libs.csip-geotools-15.1-2.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <mkdir dir="${build.web.dir}/META-INF"/> |
| <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/> |
| </target> |
| <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"> |
| <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${reference.csip-gis-objects.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${libs.csip-jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| - <copyfiles files="${libs.CSIP-GeoTools.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${libs.csip-geotools-15.1-2.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/> |
| </target> |
| <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib"> |
| <delete dir="${build.web.dir}/WEB-INF/lib"/> |
| @@ -3,8 +3,8 @@ |
| build.xml.stylesheet.CRC32=651128d4@1.65.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=2867c0ba |
| -nbproject/build-impl.xml.script.CRC32=3975cec4 |
| +nbproject/build-impl.xml.data.CRC32=1312fa57 |
| +nbproject/build-impl.xml.script.CRC32=364b5ac0 |
| nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
| @@ -1,4 +1,4 @@ |
| -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-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.2.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/sqljdbc42.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-util.jar:${j2ee.server.home}/lib/tomcat7-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 |
| #Thu Dec 17 13:44:22 MST 2015 |
| javadoc.splitindex=true |
| lib.dir=${web.docbase.dir}/WEB-INF/lib |
| @@ -54,8 +54,8 @@ |
| javac.classpath=\ |
| ${reference.csip-core.jar}:\ |
| ${reference.csip-gis-objects.jar}:\ |
| - ${libs.csip-jersey-2.16.classpath}:\ |
| - ${libs.CSIP-GeoTools.classpath} |
| + ${libs.csip-geotools-15.1-2.classpath}:\ |
| + ${libs.CSIP-Jersey-2.16.classpath} |
| javadoc.noindex=false |
| webinf.dir=web/WEB-INF |
| annotation.processing.enabled.in.editor=true |