Changeset 16064 in josm

Timestamp:

2020-03-07T23:51:06+01:00 (4 years ago)

Author:

Don-vip

Message:

see #18845 - see #18880 - update Netbeans files

Location:

trunk/ide/netbeans

Files:

• nbbuild.xml (modified) (2 diffs)
• nbproject/project.properties (modified) (1 diff)

trunk/ide/netbeans/nbbuild.xml

@@ -13 +13 @@
     <import file="nbproject/build-impl.xml" as="nbimpl"/>
 
-    <import file="../build.xml" as="josmbase"/> <!-- import the main JOSM ant file -->
+    <import file="../../build.xml" as="josmbase"/> <!-- import the main JOSM ant file -->
 
     <!--
@@ -80 +80 @@
     -->
     <target name="copy-josm-resources">
-        <copy file="../CONTRIBUTION" todir="${build.classes.dir}"/>
-        <copy file="../README" todir="${build.classes.dir}"/>
-        <copy file="../LICENSE" todir="${build.classes.dir}"/>
-        <copy file="../gpl-2.0.txt" todir="${build.classes.dir}" />
-        <copy file="../gpl-3.0.txt" todir="${build.classes.dir}" />
-        <copy todir="${build.classes.dir}/images"><fileset dir="../images"/></copy>
-        <copy todir="${build.classes.dir}/data"><fileset dir="../data"/></copy>
-        <copy todir="${build.classes.dir}/styles"><fileset dir="../styles"/></copy>
+        <copy file="../../CONTRIBUTION" todir="${build.classes.dir}"/>
+        <copy file="../../README" todir="${build.classes.dir}"/>
+        <copy file="../../LICENSE" todir="${build.classes.dir}"/>
+        <copy file="../../gpl-2.0.txt" todir="${build.classes.dir}" />
+        <copy file="../../gpl-3.0.txt" todir="${build.classes.dir}" />
+        <copy todir="${build.classes.dir}/images"><fileset dir="../../resources/images"/></copy>
+        <copy todir="${build.classes.dir}/data"><fileset dir="../../resources/data"/></copy>
+        <copy todir="${build.classes.dir}/styles"><fileset dir="../../resources/styles"/></copy>
         <copy todir="${build.classes.dir}/org/openstreetmap/gui/jmapviewer/images">
-            <fileset dir="../src/org/openstreetmap/gui/jmapviewer/images"/>
+            <fileset dir="../../src/org/openstreetmap/gui/jmapviewer/images"/>
         </copy>
     </target>

trunk/ide/netbeans/nbproject/project.properties

@@ -31 +31 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
-excludes=org/apache/commons/compress/compressors/CompressorException.java,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/CompressorStreamProvider.java,org/apache/commons/compress/compressors/FileNameUtil.java,org/apache/commons/compress/compressors/brotli/**,org/apache/commons/compress/compressors/bzip2/BZip2Utils.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lz4/**,org/apache/commons/compress/compressors/lz77support/**,org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/xz/XZUtils.java,org/apache/commons/compress/compressors/z/**,org/apache/commons/compress/compressors/zstandard/**,org/apache/commons/compress/utils/ArchiveUtils.java,org/apache/commons/jcs/JCS.java,org/apache/commons/jcs/access/GroupCacheAccess.java,org/apache/commons/jcs/access/PartitionedCacheAccess.java,org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java,org/apache/commons/jcs/access/exception/InvalidGroupException.java,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/lateral/**,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java,org/apache/commons/jcs/auxiliary/remote/RemoteCache.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java,org/apache/commons/jcs/engine/CacheAdaptor.java,org/apache/commons/jcs/engine/CacheGroup.java,org/apache/commons/jcs/engine/CacheWatchRepairable.java,org/apache/commons/jcs/engine/ZombieCacheService.java,org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java,org/apache/commons/jcs/engine/ZombieCacheWatch.java,org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java,org/apache/commons/jcs/utils/access/**,org/apache/commons/jcs/utils/discovery/**,org/apache/commons/jcs/utils/net/**,org/apache/commons/jcs/utils/props/**,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/apache/commons/compress/archivers/**,org/apache/commons/compress/changes/**,org/apache/commons/compress/parallel/**,org/apache/commons/compress/PasswordRequiredException.java
-file.reference.commons-lang-3.8.1.jar=../tools/pmd/commons-lang-3.8.1.jar
-file.reference.commons-testing-2.1.0.jar=../test/lib/commons-testing/commons-testing-2.1.0.jar
-file.reference.core-src=../src
-file.reference.equalsverifier-3.1.2.jar=../test/lib/equalsverifier-3.1.2.jar
-file.reference.spotbugs.jar=../tools/spotbugs/spotbugs.jar
-file.reference.guava.jar=../tools/guava.jar
-file.reference.hamcrest-core-1.3.jar=../test/lib/junit/hamcrest-core-1.3.jar
-file.reference.jfcunit.jar=../test/lib/jfcunit.jar
-file.reference.jmockit.jar=../test/lib/jmockit.jar
-file.reference.junit-4.12.jar=../test/lib/junit/junit-4.12.jar
-file.reference.classgraph.jar=../test/lib/classgraph-4.6.32.jar
-file.reference.test-functional=../test/functional
-file.reference.test-performance=../test/performance
-file.reference.test-unit=../test/unit
-file.reference.system-rules-1.19.0.jar=../test/lib/system-rules-1.19.0.jar
-file.reference.wiremock-standalone-2.20.0.jar=../test/lib/wiremock-standalone-2.20.0.jar
-file.reference.awaitility-3.1.5.jar=../test/lib/awaitility-3.1.5.jar
+excludes=org/apache/commons/jcs/JCS.java,org/apache/commons/jcs/access/GroupCacheAccess.java,org/apache/commons/jcs/access/PartitionedCacheAccess.java,org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java,org/apache/commons/jcs/access/exception/InvalidGroupException.java,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/lateral/**,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java,org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java,org/apache/commons/jcs/auxiliary/remote/RemoteCache.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java,org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java,org/apache/commons/jcs/engine/CacheAdaptor.java,org/apache/commons/jcs/engine/CacheGroup.java,org/apache/commons/jcs/engine/CacheWatchRepairable.java,org/apache/commons/jcs/engine/ZombieCacheService.java,org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java,org/apache/commons/jcs/engine/ZombieCacheWatch.java,org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java,org/apache/commons/jcs/utils/access/**,org/apache/commons/jcs/utils/discovery/**,org/apache/commons/jcs/utils/net/**,org/apache/commons/jcs/utils/props/**,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/apache/commons/compress/archivers/**,org/apache/commons/compress/changes/**,org/apache/commons/compress/parallel/**,org/apache/commons/compress/PasswordRequiredException.java
+file.reference.commons-lang-3.8.1.jar=../../tools/pmd/commons-lang-3.8.1.jar
+file.reference.commons-testing-2.1.0.jar=../../test/lib/commons-testing/commons-testing-2.1.0.jar
+file.reference.core-src=../../src
+file.reference.equalsverifier-3.1.2.jar=../../test/lib/equalsverifier-3.1.2.jar
+file.reference.spotbugs.jar=../../tools/spotbugs/spotbugs.jar
+file.reference.guava.jar=../../tools/guava.jar
+file.reference.hamcrest-core-1.3.jar=../../test/lib/junit/hamcrest-core-1.3.jar
+file.reference.jfcunit.jar=../../test/lib/jfcunit.jar
+file.reference.jmockit.jar=../../test/lib/jmockit.jar
+file.reference.junit-4.12.jar=../../test/lib/junit/junit-4.12.jar
+file.reference.classgraph.jar=../../test/lib/classgraph-4.6.32.jar
+file.reference.test-functional=../../test/functional
+file.reference.test-performance=../../test/performance
+file.reference.test-unit=../../test/unit
+file.reference.system-rules-1.19.0.jar=../../test/lib/system-rules-1.19.0.jar
+file.reference.wiremock-standalone-2.20.0.jar=../../test/lib/wiremock-standalone-2.20.0.jar
+file.reference.awaitility-3.1.5.jar=../../test/lib/awaitility-3.1.5.jar
 includes=**/*.java
 jar.compress=false