Changeset 16398 in josm for trunk


Ignore:
Timestamp:
2020-05-10T11:51:42+02:00 (4 years ago)
Author:
simon04
Message:

see #19208 - JCS: update package to org.apache.commons.jcs3

Location:
trunk
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • trunk/ivy.xml

    r16397 r16398  
    2424        <dependency conf="api->default" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    2525        <dependency conf="api->default" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    26         <dependency conf="api->default" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
     26        <dependency conf="api->default" org="org.apache.commons" name="commons-jcs3-core" rev="3.0-SNAPSHOT"/>
    2727        <dependency conf="api->default" org="org.apache.commons" name="commons-compress" rev="1.20"/>
    2828        <dependency conf="api->default" org="org.tukaani" name="xz" rev="1.8"/>
    … …  
    3434        <dependency conf="sources->sources" org="javax.json" name="javax.json-api" rev="1.1.4"/>
    3535        <dependency conf="sources->sources" org="org.glassfish" name="javax.json" rev="1.1.4"/>
    36         <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs-core" rev="3.0-SNAPSHOT"/>
     36        <dependency conf="sources->sources" org="org.apache.commons" name="commons-jcs3-core" rev="3.0-SNAPSHOT"/>
    3737        <dependency conf="sources->sources" org="org.apache.commons" name="commons-compress" rev="1.20"/>
    3838        <dependency conf="sources->sources" org="org.tukaani" name="xz" rev="1.8"/>

  • trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

    r14271 r16398  
    1111import java.util.concurrent.ConcurrentHashMap;
    1212
    13 import org.apache.commons.jcs.engine.ElementAttributes;
     13import org.apache.commons.jcs3.engine.ElementAttributes;
    1414import org.openstreetmap.josm.tools.Logging;
    1515

  • trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java

    r16392 r16398  
    1515import java.util.logging.SimpleFormatter;
    1616
    17 import org.apache.commons.jcs.JCS;
    18 import org.apache.commons.jcs.access.CacheAccess;
    19 import org.apache.commons.jcs.auxiliary.AuxiliaryCache;
    20 import org.apache.commons.jcs.auxiliary.AuxiliaryCacheFactory;
    21 import org.apache.commons.jcs.auxiliary.disk.behavior.IDiskCacheAttributes;
    22 import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
    23 import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheFactory;
    24 import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
    25 import org.apache.commons.jcs.auxiliary.disk.indexed.IndexedDiskCacheFactory;
    26 import org.apache.commons.jcs.engine.CompositeCacheAttributes;
    27 import org.apache.commons.jcs.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
    28 import org.apache.commons.jcs.engine.control.CompositeCache;
    29 import org.apache.commons.jcs.utils.serialization.StandardSerializer;
     17import org.apache.commons.jcs3.JCS;
     18import org.apache.commons.jcs3.access.CacheAccess;
     19import org.apache.commons.jcs3.auxiliary.AuxiliaryCache;
     20import org.apache.commons.jcs3.auxiliary.AuxiliaryCacheFactory;
     21import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes;
     22import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheAttributes;
     23import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheFactory;
     24import org.apache.commons.jcs3.auxiliary.disk.indexed.IndexedDiskCacheAttributes;
     25import org.apache.commons.jcs3.auxiliary.disk.indexed.IndexedDiskCacheFactory;
     26import org.apache.commons.jcs3.engine.CompositeCacheAttributes;
     27import org.apache.commons.jcs3.engine.behavior.ICompositeCacheAttributes.DiskUsagePattern;
     28import org.apache.commons.jcs3.engine.control.CompositeCache;
     29import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
    3030import org.openstreetmap.josm.data.preferences.BooleanProperty;
    3131import org.openstreetmap.josm.data.preferences.IntegerProperty;
    … …  
    6060        // raising logging level gives ~500x performance gain
    6161        // http://westsworld.dk/blog/2008/01/jcs-and-performance/
    62         jcsLog = Logger.getLogger("org.apache.commons.jcs");
     62        jcsLog = Logger.getLogger("org.apache.commons.jcs3");
    6363        try {
    6464            jcsLog.setLevel(Level.INFO);

  • trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

    r15740 r16398  
    1717import java.util.regex.Matcher;
    1818
    19 import org.apache.commons.jcs.access.behavior.ICacheAccess;
    20 import org.apache.commons.jcs.engine.behavior.ICacheElement;
     19import org.apache.commons.jcs3.access.behavior.ICacheAccess;
     20import org.apache.commons.jcs3.engine.behavior.ICacheElement;
    2121import org.openstreetmap.josm.data.cache.ICachedLoaderListener.LoadResult;
    2222import org.openstreetmap.josm.data.imagery.TileJobOptions;

  • trunk/src/org/openstreetmap/josm/data/gpx/GpxExtensionCollection.java

    r15560 r16398  
    1010import java.util.stream.Stream;
    1111
    12 import org.apache.commons.jcs.access.exception.InvalidArgumentException;
     12import org.apache.commons.jcs3.access.exception.InvalidArgumentException;
    1313import org.openstreetmap.josm.io.GpxReader;
    1414import org.xml.sax.Attributes;

  • trunk/src/org/openstreetmap/josm/data/imagery/CachedTileLoaderFactory.java

    r13733 r16398  
    88import java.util.concurrent.TimeUnit;
    99
    10 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     10import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    1111import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
    1212import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;

  • trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

    r14624 r16398  
    55import java.util.concurrent.TimeUnit;
    66
    7 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     7import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    88import org.openstreetmap.gui.jmapviewer.Tile;
    99import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;

  • trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

    r15525 r16398  
    2222import java.util.regex.Pattern;
    2323
    24 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     24import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    2525import org.openstreetmap.gui.jmapviewer.Tile;
    2626import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;

  • trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoader.java

    r14262 r16398  
    22package org.openstreetmap.josm.data.imagery;
    33
    4 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     4import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    55import org.openstreetmap.gui.jmapviewer.Tile;
    66import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;

  • trunk/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java

    r13733 r16398  
    44import java.util.concurrent.ThreadPoolExecutor;
    55
    6 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     6import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    77import org.openstreetmap.gui.jmapviewer.Tile;
    88import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;

  • trunk/src/org/openstreetmap/josm/gui/layer/AbstractCachedTileSourceLayer.java

    r16396 r16398  
    55import java.util.concurrent.ConcurrentHashMap;
    66
    7 import org.apache.commons.jcs.access.CacheAccess;
    8 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     7import org.apache.commons.jcs3.access.CacheAccess;
     8import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    99import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
    1010import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;

  • trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

    r15456 r16398  
    66import java.util.Collections;
    77
    8 import org.apache.commons.jcs.access.CacheAccess;
     8import org.apache.commons.jcs3.access.CacheAccess;
    99import org.openstreetmap.gui.jmapviewer.JMapViewer;
    1010import org.openstreetmap.gui.jmapviewer.OsmMercator;

  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r15716 r16398  
    1414import javax.swing.Action;
    1515
    16 import org.apache.commons.jcs.access.CacheAccess;
     16import org.apache.commons.jcs3.access.CacheAccess;
    1717import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
    1818import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;

  • trunk/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java

    r14120 r16398  
    55import java.util.Collection;
    66
    7 import org.apache.commons.jcs.access.CacheAccess;
     7import org.apache.commons.jcs3.access.CacheAccess;
    88import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
    99import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;

  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ThumbsLoader.java

    r14590 r16398  
    1717import javax.imageio.ImageIO;
    1818
    19 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     19import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    2020import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
    2121import org.openstreetmap.josm.data.cache.JCSCacheManager;

  • trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

    r15735 r16398  
    3838import javax.swing.table.TableRowSorter;
    3939
    40 import org.apache.commons.jcs.access.exception.InvalidArgumentException;
     40import org.apache.commons.jcs3.access.exception.InvalidArgumentException;
    4141import org.openstreetmap.josm.data.SystemOfMeasurement;
    4242import org.openstreetmap.josm.data.gpx.GpxConstants;

  • trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

    r15606 r16398  
    2727import javax.swing.JSlider;
    2828
    29 import org.apache.commons.jcs.access.exception.InvalidArgumentException;
     29import org.apache.commons.jcs3.access.exception.InvalidArgumentException;
    3030import org.openstreetmap.josm.actions.ExpertToggleAction;
    3131import org.openstreetmap.josm.data.gpx.GpxData;

  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheSettingsPanel.java

    r14731 r16398  
    2727import javax.swing.table.TableModel;
    2828
    29 import org.apache.commons.jcs.access.CacheAccess;
    30 import org.apache.commons.jcs.engine.stats.behavior.ICacheStats;
    31 import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
    32 import org.apache.commons.jcs.engine.stats.behavior.IStats;
     29import org.apache.commons.jcs3.access.CacheAccess;
     30import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats;
     31import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
     32import org.apache.commons.jcs3.engine.stats.behavior.IStats;
    3333import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
    3434import org.openstreetmap.josm.data.cache.JCSCacheManager;

  • trunk/test/unit/org/openstreetmap/josm/data/cache/HostLimitQueueTest.java

    r15586 r16398  
    1111import java.util.concurrent.atomic.AtomicInteger;
    1212
    13 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     13import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    1414import org.junit.Rule;
    1515import org.junit.Test;

  • trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java

    r16182 r16398  
    99import java.util.logging.Logger;
    1010
    11 import org.apache.commons.jcs.access.CacheAccess;
    12 import org.apache.commons.jcs.auxiliary.disk.block.BlockDiskCacheAttributes;
     11import org.apache.commons.jcs3.access.CacheAccess;
     12import org.apache.commons.jcs3.auxiliary.disk.block.BlockDiskCacheAttributes;
    1313import org.junit.Rule;
    1414import org.junit.Test;
    … …  
    4646    public void testLoggingAdaptor12054() throws IOException {
    4747        JCSCacheManager.getCache("foobar", 1, 0, "foobar"); // cause logging adaptor to be initialized
    48         Logger.getLogger("org.apache.commons.jcs").warning("{switch:0}");
     48        Logger.getLogger("org.apache.commons.jcs3").warning("{switch:0}");
    4949    }
    5050

  • trunk/test/unit/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJobTest.java

    r14787 r16398  
    1313import java.util.concurrent.TimeUnit;
    1414
    15 import org.apache.commons.jcs.access.behavior.ICacheAccess;
    16 import org.apache.commons.jcs.engine.behavior.ICacheElement;
     15import org.apache.commons.jcs3.access.behavior.ICacheAccess;
     16import org.apache.commons.jcs3.engine.behavior.ICacheElement;
    1717import org.junit.Before;
    1818import org.junit.Rule;

  • trunk/test/unit/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJobTest.java

    r14565 r16398  
    1616import java.util.regex.Pattern;
    1717
    18 import org.apache.commons.jcs.access.behavior.ICacheAccess;
     18import org.apache.commons.jcs3.access.behavior.ICacheAccess;
    1919import org.junit.Before;
    2020import org.junit.Rule;

  • trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

    r16128 r16398  
    2323import javax.imageio.ImageIO;
    2424
    25 import org.apache.commons.jcs.access.CacheAccess;
     25import org.apache.commons.jcs3.access.CacheAccess;
    2626import org.junit.AfterClass;
    2727import org.junit.BeforeClass;
Note: See TracChangeset for help on using the changeset viewer.