| @@ -1,23 +1,42 @@ |
| <?xml version="1.0" encoding="UTF-8"?> |
| <!-- |
| +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
| |
| - Licensed to the Apache Software Foundation (ASF) under one |
| - or more contributor license agreements. See the NOTICE file |
| - distributed with this work for additional information |
| - regarding copyright ownership. The ASF licenses this file |
| - to you under the Apache License, Version 2.0 (the |
| - "License"); you may not use this file except in compliance |
| - with the License. You may obtain a copy of the License at |
| +Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. |
| |
| - http://www.apache.org/licenses/LICENSE-2.0 |
| +Oracle and Java are registered trademarks of Oracle and/or its affiliates. |
| +Other names may be trademarks of their respective owners. |
| |
| - Unless required by applicable law or agreed to in writing, |
| - software distributed under the License is distributed on an |
| - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY |
| - KIND, either express or implied. See the License for the |
| - specific language governing permissions and limitations |
| - under the License. |
| +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" if="deploy.ant.enabled"> |
| @@ -40,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> |
| @@ -50,6 +50,36 @@ |
| </target> |
| <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/> |
| <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
| + <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/> |
| + <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> |
| + <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> |
| + <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> |
| + <condition property="platform.javac" value="${platform.home}/bin/javac"> |
| + <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> |
| + </condition> |
| + <property name="platform.javac" value="${platform.javac.tmp}"/> |
| + <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> |
| + <condition property="platform.java" value="${platform.home}/bin/java"> |
| + <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> |
| + </condition> |
| + <property name="platform.java" value="${platform.java.tmp}"/> |
| + <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> |
| + <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> |
| + <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> |
| + </condition> |
| + <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> |
| + <fail unless="platform.home">Must set platform.home</fail> |
| + <fail unless="platform.bootcp">Must set platform.bootcp</fail> |
| + <fail unless="platform.java">Must set platform.java</fail> |
| + <fail unless="platform.javac">Must set platform.javac</fail> |
| + <fail if="platform.invalid"> |
| + The J2SE Platform is not correctly set up. |
| + Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. |
| + Either open the project in the IDE and setup the Platform with the same name or add it manually. |
| + For example like this: |
| + ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file) |
| + or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) |
| + </fail> |
| <condition property="have.tests"> |
| <or> |
| <available file="${test.src.dir}"/> |
| @@ -191,15 +221,6 @@ |
| <length length="0" string="${endorsed.classpath}" when="greater"/> |
| </and> |
| </condition> |
| - <condition else="false" property="jdkBug6558476"> |
| - <and> |
| - <matches pattern="1\.[56]" string="${java.specification.version}"/> |
| - <not> |
| - <os family="unix"/> |
| - </not> |
| - </and> |
| - </condition> |
| - <property name="javac.fork" value="${jdkBug6558476}"/> |
| <condition property="junit.available"> |
| <or> |
| <available classname="org.junit.Test" classpath="${run.test.classpath}"/> |
| @@ -294,7 +315,7 @@ |
| <property location="${build.dir}/empty" name="empty.dir"/> |
| <mkdir dir="${empty.dir}"/> |
| <mkdir dir="@{apgeneratedsrcdir}"/> |
| - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
| + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
| <src> |
| <dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
| <include name="*"/> |
| @@ -331,7 +352,7 @@ |
| <sequential> |
| <property location="${build.dir}/empty" name="empty.dir"/> |
| <mkdir dir="${empty.dir}"/> |
| - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
| + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
| <src> |
| <dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
| <include name="*"/> |
| @@ -408,7 +429,7 @@ |
| <attribute default="" name="testmethods"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
| <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
| <syspropertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -431,7 +452,7 @@ |
| <element name="customize" optional="true"/> |
| <sequential> |
| <property name="run.jvmargs.ide" value=""/> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
| <batchtest todir="${build.test.results.dir}"> |
| <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
| <filename name="@{testincludes}"/> |
| @@ -471,7 +492,7 @@ |
| </fileset> |
| </union> |
| <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> |
| - <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-cfa" testname="TestNG tests" workingDir="${basedir}"> |
| + <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-cfa" testname="TestNG tests" workingDir="${basedir}"> |
| <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> |
| <propertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -549,7 +570,7 @@ |
| <attribute default="" name="testmethods"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
| <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
| <syspropertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -558,8 +579,7 @@ |
| <formatter type="brief" usefile="false"/> |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -574,7 +594,7 @@ |
| <element name="customize" optional="true"/> |
| <sequential> |
| <property name="run.jvmargs.ide" value=""/> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
| <batchtest todir="${build.test.results.dir}"> |
| <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
| <filename name="@{testincludes}"/> |
| @@ -591,8 +611,7 @@ |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| <jvmarg line="${run.jvmargs.ide}"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -698,7 +717,7 @@ |
| <attribute default="${debug.classpath}" name="classpath"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <java classname="@{classname}" fork="true"> |
| + <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
| <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
| <jvmarg line="${runmain.jvmargs}"/> |
| <classpath> |
| @@ -730,6 +749,9 @@ |
| <classpath> |
| <path path="@{classpath}"/> |
| </classpath> |
| + <bootclasspath> |
| + <path path="${platform.bootcp}"/> |
| + </bootclasspath> |
| </nbjpdastart> |
| </sequential> |
| </macrodef> |
| @@ -750,18 +772,6 @@ |
| </macrodef> |
| </target> |
| <target name="-init-debug-args"> |
| - <property name="version-output" value="java version "${ant.java.version}"/> |
| - <condition property="have-jdk-older-than-1.4"> |
| - <or> |
| - <contains string="${version-output}" substring="java version "1.0"/> |
| - <contains string="${version-output}" substring="java version "1.1"/> |
| - <contains string="${version-output}" substring="java version "1.2"/> |
| - <contains string="${version-output}" substring="java version "1.3"/> |
| - </or> |
| - </condition> |
| - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> |
| - <istrue value="${have-jdk-older-than-1.4}"/> |
| - </condition> |
| <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> |
| <os family="windows"/> |
| </condition> |
| @@ -776,10 +786,9 @@ |
| <attribute default="${application.args.param}" name="args"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <java classname="@{classname}" fork="true"> |
| + <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
| <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <jvmarg line="${runmain.jvmargs}"/> |
| <classpath> |
| <path path="@{classpath}"/> |
| @@ -1013,6 +1022,7 @@ |
| <copyfiles files="${file.reference.jfreechart-1.0.13.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.Jama-1.0.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| <copyfiles files="${file.reference.csip-lib-water-4.4.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/> |
| + <copyfiles files="${file.reference.gson-2.10.1.jar}" 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> |
| @@ -1024,6 +1034,7 @@ |
| <copyfiles files="${file.reference.jfreechart-1.0.13.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.Jama-1.0.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| <copyfiles files="${file.reference.csip-lib-water-4.4.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/> |
| + <copyfiles files="${file.reference.gson-2.10.1.jar}" 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"/> |
| @@ -1189,6 +1200,9 @@ |
| <sourcepath> |
| <path path="${web.docbase.dir}"/> |
| </sourcepath> |
| + <bootclasspath> |
| + <path path="${platform.bootcp}"/> |
| + </bootclasspath> |
| </nbjpdaconnect> |
| </target> |
| <target if="do.display.browser.debug.old" name="debug-display-browser-old"> |
| @@ -1311,7 +1325,7 @@ |
| --> |
| <target depends="init" if="have.sources" name="javadoc-build"> |
| <mkdir dir="${dist.javadoc.dir}"/> |
| - <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
| + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
| <classpath> |
| <path path="${javac.classpath}:${j2ee.platform.classpath}"/> |
| </classpath> |
| @@ -1428,6 +1442,7 @@ |
| </target> |
| <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> |
| <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> |
| + <target depends="debug-test-method" name="debug-single-method"/> |
| <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> |
| <webproject1:nbjpdareload dir="${build.test.classes.dir}"/> |
| </target> |