| @@ -1,42 +1,23 @@ |
| <?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. |
| + 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 |
| |
| -Oracle and Java are registered trademarks of Oracle and/or its affiliates. |
| -Other names may be trademarks of their respective owners. |
| + http://www.apache.org/licenses/LICENSE-2.0 |
| |
| -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]" |
| + 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. |
| |
| -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"> |
| @@ -558,8 +558,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> |
| @@ -591,8 +590,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> |
| @@ -750,18 +748,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> |
| @@ -778,8 +764,7 @@ |
| <sequential> |
| <java classname="@{classname}" fork="true"> |
| <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}"/> |
| @@ -1424,6 +1409,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> |
| @@ -52,7 +52,6 @@ |
| resources.add(csip.DynamicPyModelDataService.class); |
| resources.add(csip.GzipWriterInterceptor.class); |
| resources.add(csip.QueryService.class); |
| - resources.add(csip.QueueingModelDataService.class); |
| resources.add(csip.ReportService.class); |
| resources.add(csip.UIService.class); |
| resources.add(d.crlmod.crop.V1_0.class); |
| @@ -100,7 +99,7 @@ |
| resources.add(d.crlmod.operationImport.V1_1.class); |
| resources.add(d.crlmod.operationImport.V2_0.class); |
| resources.add(d.crlmod.operationImport.V3_0.class); |
| - resources.add(d.crlmod.operationImport.V3_9.class ); |
| + resources.add(d.crlmod.operationImport.V3_9.class); |
| resources.add(d.crlmod.operationImport.V4_0.class ); |
| resources.add(d.crlmod.residue.V1_0.class ); |
| resources.add(d.crlmod.residue.V1_1.class ); |
| @@ -112,7 +111,7 @@ |
| resources.add(d.crlmod.residue.V4_0.class ); |
| resources.add(d.crlmod.residue.V4_1.class ); |
| resources.add(d.crlmod.residueImport.V1_1.class ); |
| - resources.add(d.crlmod.residueImport.V2_0.class); |
| + resources.add(d.crlmod.residueImport.V2_0.class ); |
| resources.add(d.crlmod.residueImport.V3_0.class); |
| resources.add(d.crlmod.residueImport.V3_9.class); |
| resources.add(d.crlmod.residueImport.V4_0.class); |