From c386b8f938adf73da844438a4fd24756f625b429 Mon Sep 17 00:00:00 2001 From: Marcus Lewerenz Date: Fri, 15 Dec 2023 10:09:49 +0100 Subject: [PATCH 1/5] Removed getLink() api call --- .../java/org/icatproject/ids/IdsBean.java | 95 ------------------- .../java/org/icatproject/ids/IdsService.java | 41 -------- .../ids/integration/one/LinkTest.java | 35 ------- .../ids/integration/two/LinkTest.java | 42 -------- .../ids/integration/twodf/LinkTest.java | 42 -------- .../util/client/TestingClient.java | 22 ----- 6 files changed, 277 deletions(-) delete mode 100644 src/test/java/org/icatproject/ids/integration/one/LinkTest.java delete mode 100644 src/test/java/org/icatproject/ids/integration/two/LinkTest.java delete mode 100644 src/test/java/org/icatproject/ids/integration/twodf/LinkTest.java diff --git a/src/main/java/org/icatproject/ids/IdsBean.java b/src/main/java/org/icatproject/ids/IdsBean.java index 0842b74f..b7d15084 100644 --- a/src/main/java/org/icatproject/ids/IdsBean.java +++ b/src/main/java/org/icatproject/ids/IdsBean.java @@ -1027,101 +1027,6 @@ public String getIcatUrl(String ip) { return propertyHandler.getIcatUrl(); } - public String getLink(String sessionId, long datafileId, String username, String ip) - throws BadRequestException, InsufficientPrivilegesException, InternalException, NotFoundException, - DataNotOnlineException, NotImplementedException { - - long start = System.currentTimeMillis(); - - // Log and validate - logger.info("New webservice request: getLink datafileId=" + datafileId + " username='" + username + "'"); - - if (!linkEnabled) { - throw new NotImplementedException("Sorry getLink is not available on this IDS installation"); - } else { - logger.warn("The getLink API call is deprecated and slated for removal in ids.server 3.0"); - } - - validateUUID("sessionId", sessionId); - - Datafile datafile = null; - try { - datafile = (Datafile) icat.get(sessionId, "Datafile INCLUDE Dataset, Investigation, Facility", datafileId); - } catch (IcatException_Exception e) { - IcatExceptionType type = e.getFaultInfo().getType(); - if (type == IcatExceptionType.BAD_PARAMETER) { - throw new BadRequestException(e.getMessage()); - } else if (type == IcatExceptionType.INSUFFICIENT_PRIVILEGES) { - throw new InsufficientPrivilegesException(e.getMessage()); - } else if (type == IcatExceptionType.INTERNAL) { - throw new InternalException(e.getMessage()); - } else if (type == IcatExceptionType.NO_SUCH_OBJECT_FOUND) { - throw new NotFoundException(e.getMessage()); - } else if (type == IcatExceptionType.OBJECT_ALREADY_EXISTS) { - throw new InternalException(e.getClass() + " " + e.getMessage()); - } else if (type == IcatExceptionType.SESSION) { - throw new InsufficientPrivilegesException(e.getMessage()); - } else if (type == IcatExceptionType.VALIDATION) { - throw new BadRequestException(e.getMessage()); - } - } - if (datafile.getLocation() == null) { - throw new NotFoundException("Datafile not found"); - } - - String location = getLocation(datafile.getId(), datafile.getLocation()); - DsInfo dsInfo = new DsInfoImpl(datafile.getDataset()); - - try (Lock lock = lockManager.lock(dsInfo, LockType.SHARED)) { - if (storageUnit == StorageUnit.DATASET) { - Set mt = Collections.emptySet(); - if (restoreIfOffline(dsInfo, mt)) { - throw new DataNotOnlineException( - "Before linking a datafile, its dataset has to be restored, restoration requested automatically"); - } - } else if (storageUnit == StorageUnit.DATAFILE) { - DfInfoImpl dfInfo = new DfInfoImpl(datafileId, datafile.getName(), location, datafile.getCreateId(), - datafile.getModId(), datafile.getDataset().getId()); - if (restoreIfOffline(dfInfo)) { - throw new DataNotOnlineException( - "Before linking a datafile, it has to be restored, restoration requested automatically"); - } - } - - Path target = mainStorage.getPath(location, datafile.getCreateId(), datafile.getModId()); - ShellCommand sc = new ShellCommand("setfacl", "-m", "user:" + username + ":r", target.toString()); - if (sc.getExitValue() != 0) { - throw new BadRequestException(sc.getMessage() + ". Check that user '" + username + "' exists"); - } - Path link = linkDir.resolve(UUID.randomUUID().toString()); - Files.createLink(link, target); - - if (logSet.contains(CallType.LINK)) { - try { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try (JsonGenerator gen = Json.createGenerator(baos).writeStartObject()) { - gen.write("userName", icat.getUserName(sessionId)); - gen.write("datafileId", datafileId); - gen.writeEnd(); - } - String body = baos.toString(); - transmitter.processMessage("getLink", ip, body, start); - } catch (IcatException_Exception e) { - logger.error("Failed to prepare jms message " + e.getClass() + " " + e.getMessage()); - } - } - - return link.toString(); - } catch (AlreadyLockedException e) { - logger.debug("Could not acquire lock, getLink failed"); - throw new DataNotOnlineException("Data is busy"); - } catch (IOException e) { - logger.error("I/O error " + e.getMessage() + " linking " + location + " from MainStorage"); - throw new InternalException(e.getClass() + " " + e.getMessage()); - } - - } - public String getServiceStatus(String sessionId, String ip) throws InternalException, InsufficientPrivilegesException { diff --git a/src/main/java/org/icatproject/ids/IdsService.java b/src/main/java/org/icatproject/ids/IdsService.java index 8d01591d..2679381f 100644 --- a/src/main/java/org/icatproject/ids/IdsService.java +++ b/src/main/java/org/icatproject/ids/IdsService.java @@ -276,47 +276,6 @@ public String getIcatUrl(@Context HttpServletRequest request) { return idsBean.getIcatUrl(request.getRemoteAddr()); } - /** - * Return a hard link to a data file. - * - * This is only useful in those cases where the user has direct access to - * the file system where the IDS is storing data. Only read access to the - * file is granted. - * - * @summary getLink - * - * @param sessionId - * A valid ICAT session ID - * @param datafileId - * the id of a data file - * @param username - * the name of the user who will will be granted access to the - * linked file. - * - * @return the path of the created link. - * - * @throws BadRequestException - * @throws InsufficientPrivilegesException - * @throws NotImplementedException - * @throws InternalException - * @throws NotFoundException - * @throws DataNotOnlineException - * - * @statuscode 200 To indicate success - * - */ - @POST - @Path("getLink") - @Consumes(MediaType.APPLICATION_FORM_URLENCODED) - @Produces(MediaType.TEXT_PLAIN) - @Deprecated - public String getLink(@Context HttpServletRequest request, @FormParam("sessionId") String sessionId, - @FormParam("datafileId") long datafileId, @FormParam("username") String username) - throws BadRequestException, InsufficientPrivilegesException, NotImplementedException, InternalException, - NotFoundException, DataNotOnlineException { - return idsBean.getLink(sessionId, datafileId, username, request.getRemoteAddr()); - } - /** * Obtain detailed information about what the ids is doing. You need to be * privileged to use this call. diff --git a/src/test/java/org/icatproject/ids/integration/one/LinkTest.java b/src/test/java/org/icatproject/ids/integration/one/LinkTest.java deleted file mode 100644 index ad3ebe3a..00000000 --- a/src/test/java/org/icatproject/ids/integration/one/LinkTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.icatproject.ids.integration.one; - -import static org.junit.Assert.assertEquals; - -import java.io.ByteArrayOutputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.icatproject.ids.integration.BaseTest; -import org.icatproject.ids.integration.util.Setup; -import org.junit.BeforeClass; -import org.junit.Test; - -public class LinkTest extends BaseTest { - - private static Path here; - - @BeforeClass - public static void setup() throws Exception { - setup = new Setup("one.properties"); - icatsetup(); - here = Paths.get("").toAbsolutePath(); - } - - @Test - public void getLink() throws Exception { - Path link = here.resolve("alink"); - link = testingClient.getLink(sessionId, datafileIds.get(0), System.getProperty("user.name"), 200); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Files.copy(link, baos); - assertEquals("df1 test content very compressible very compressible", baos.toString()); - Files.delete(link); - } -} diff --git a/src/test/java/org/icatproject/ids/integration/two/LinkTest.java b/src/test/java/org/icatproject/ids/integration/two/LinkTest.java deleted file mode 100644 index 0d130be6..00000000 --- a/src/test/java/org/icatproject/ids/integration/two/LinkTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.icatproject.ids.integration.two; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.ByteArrayOutputStream; -import java.nio.file.Files; -import java.nio.file.Path; - -import org.icatproject.ids.integration.BaseTest; -import org.icatproject.ids.integration.util.Setup; -import org.icatproject.ids.integration.util.client.DataNotOnlineException; -import org.junit.BeforeClass; -import org.junit.Test; - -public class LinkTest extends BaseTest { - - @BeforeClass - public static void setup() throws Exception { - setup = new Setup("two.properties"); - icatsetup(); - } - - @Test - public void getLink() throws Exception { - - String username = System.getProperty("user.name"); - try { - testingClient.getLink(sessionId, datafileIds.get(0), username, 503); - fail("Should have thrown an exception"); - } catch (DataNotOnlineException e) { - // All is well - } - - waitForIds(); - - Path link = testingClient.getLink(sessionId, datafileIds.get(0), username, 200); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Files.copy(link, baos); - assertEquals("df1 test content very compressible very compressible", baos.toString()); - } -} diff --git a/src/test/java/org/icatproject/ids/integration/twodf/LinkTest.java b/src/test/java/org/icatproject/ids/integration/twodf/LinkTest.java deleted file mode 100644 index 53653c4a..00000000 --- a/src/test/java/org/icatproject/ids/integration/twodf/LinkTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.icatproject.ids.integration.twodf; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.io.ByteArrayOutputStream; -import java.nio.file.Files; -import java.nio.file.Path; - -import org.icatproject.ids.integration.BaseTest; -import org.icatproject.ids.integration.util.Setup; -import org.icatproject.ids.integration.util.client.DataNotOnlineException; -import org.junit.BeforeClass; -import org.junit.Test; - -public class LinkTest extends BaseTest { - - @BeforeClass - public static void setup() throws Exception { - setup = new Setup("twodf.properties"); - icatsetup(); - } - - @Test - public void getLink() throws Exception { - - String username = System.getProperty("user.name"); - try { - testingClient.getLink(sessionId, datafileIds.get(0), username, 503); - fail("Should have thrown an exception"); - } catch (DataNotOnlineException e) { - // All is well - } - - waitForIds(); - - Path link = testingClient.getLink(sessionId, datafileIds.get(0), username, 200); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - Files.copy(link, baos); - assertEquals("df1 test content very compressible very compressible", baos.toString()); - } -} diff --git a/src/test/java/org/icatproject/ids/integration/util/client/TestingClient.java b/src/test/java/org/icatproject/ids/integration/util/client/TestingClient.java index cf95c048..81d0ea38 100644 --- a/src/test/java/org/icatproject/ids/integration/util/client/TestingClient.java +++ b/src/test/java/org/icatproject/ids/integration/util/client/TestingClient.java @@ -355,28 +355,6 @@ public InputStream getData(String preparedId, long offset, Integer sc) } } - public Path getLink(String sessionId, long datafileId, String username, int sc) - throws BadRequestException, InsufficientPrivilegesException, InternalException, NotFoundException, - DataNotOnlineException, NotImplementedException { - URI uri = getUri(getUriBuilder("getLink")); - List formparams = new ArrayList<>(); - formparams.add(new BasicNameValuePair("sessionId", sessionId)); - formparams.add(new BasicNameValuePair("datafileId", Long.toString(datafileId))); - formparams.add(new BasicNameValuePair("username", username)); - - try (CloseableHttpClient httpclient = HttpClients.createDefault()) { - HttpPost httpPost = new HttpPost(uri); - httpPost.setEntity(new UrlEncodedFormEntity(formparams)); - try (CloseableHttpResponse response = httpclient.execute(httpPost)) { - return Paths.get(getString(response, sc)); - } catch (InsufficientStorageException e) { - throw new InternalException(e.getClass() + " " + e.getMessage()); - } - } catch (IOException e) { - throw new InternalException(e.getClass() + " " + e.getMessage()); - } - } - public ServiceStatus getServiceStatus(String sessionId, Integer sc) throws InternalException, InsufficientPrivilegesException, NotImplementedException { From 715094addf263add4ddde37e0e5b1bda93e74b02 Mon Sep 17 00:00:00 2001 From: Marcus Lewerenz Date: Fri, 15 Dec 2023 11:13:44 +0100 Subject: [PATCH 2/5] removed linkLifetimeSeconds --- src/main/config/run.properties.example | 3 --- src/main/java/org/icatproject/ids/PropertyHandler.java | 5 ----- src/main/scripts/setup | 3 --- src/site/xhtml/installation.xhtml.vm | 9 --------- src/test/resources/one.properties | 2 -- src/test/resources/two.properties | 2 -- src/test/resources/twodf.properties | 2 -- 7 files changed, 26 deletions(-) diff --git a/src/main/config/run.properties.example b/src/main/config/run.properties.example index 2dadc9bd..28f93f3a 100644 --- a/src/main/config/run.properties.example +++ b/src/main/config/run.properties.example @@ -36,9 +36,6 @@ tidyBlockSize = 500 !filesCheck.lastIdFile = ${HOME}/ids/lastIdFile !filesCheck.errorLog = ${HOME}/ids/errorLog -# Link properties. Deprecated -!linkLifetimeSeconds = 3600 - # JMS Logging log.list = READ WRITE INFO LINK MIGRATE PREPARE diff --git a/src/main/java/org/icatproject/ids/PropertyHandler.java b/src/main/java/org/icatproject/ids/PropertyHandler.java index 2950616a..7043adf8 100644 --- a/src/main/java/org/icatproject/ids/PropertyHandler.java +++ b/src/main/java/org/icatproject/ids/PropertyHandler.java @@ -214,11 +214,6 @@ private PropertyHandler() { } } - if (props.has("linkLifetimeSeconds")) { - linkLifetimeMillis = props.getNonNegativeLong("linkLifetimeSeconds") * 1000L; - } else { - linkLifetimeMillis = 0; - } maxIdsInQuery = props.getPositiveInt("maxIdsInQuery"); /* JMS stuff */ diff --git a/src/main/scripts/setup b/src/main/scripts/setup index e0594813..dc5655a3 100755 --- a/src/main/scripts/setup +++ b/src/main/scripts/setup @@ -53,9 +53,6 @@ if arg == "INSTALL": abort("Please create directory " + parent + " for filesCheck.errorLog specified in run.properties") if not idsProperties.get("reader"): abort("reader is not set in run.properties") - if int(idsProperties.get("linkLifetimeSeconds", 0)) > 0: - warnings.warn("The getLink API call is deprecated and slated for removal in ids.server 3.0") - try: uninstall() actions.createJMSResource("jakarta.jms.Topic", "jms/IDS/log") diff --git a/src/site/xhtml/installation.xhtml.vm b/src/site/xhtml/installation.xhtml.vm index e20abb73..bb68f276 100644 --- a/src/site/xhtml/installation.xhtml.vm +++ b/src/site/xhtml/installation.xhtml.vm @@ -126,15 +126,6 @@
readOnly
If true disables write operations (put and delete).
-
linkLifetimeSeconds
-
Optional, default zero. The length of time in seconds to keep the links - established by the getLink call. If this is set to zero then the getLink - call is disabled. -

Deprecated: the getLink call is deprecated - and slated for removal along with this property in - ids.server 3.0.

-
-
reader
Space separated icat plugin name and credentials for a user permitted diff --git a/src/test/resources/one.properties b/src/test/resources/one.properties index 0ee27b2f..1b7a006f 100644 --- a/src/test/resources/one.properties +++ b/src/test/resources/one.properties @@ -18,6 +18,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -linkLifetimeSeconds = 3600 - log.list = READ WRITE INFO LINK MIGRATE PREPARE diff --git a/src/test/resources/two.properties b/src/test/resources/two.properties index 25f2c4e7..2d391ddb 100644 --- a/src/test/resources/two.properties +++ b/src/test/resources/two.properties @@ -25,6 +25,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -linkLifetimeSeconds = 3600 - log.list = READ WRITE INFO LINK MIGRATE PREPARE diff --git a/src/test/resources/twodf.properties b/src/test/resources/twodf.properties index b98ea546..ce73a98b 100644 --- a/src/test/resources/twodf.properties +++ b/src/test/resources/twodf.properties @@ -25,6 +25,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -linkLifetimeSeconds = 3600 - log.list = READ WRITE INFO LINK MIGRATE PREPARE From 8f148e852a517cb96433e03e2ec4695bde316b73 Mon Sep 17 00:00:00 2001 From: Marcus Lewerenz Date: Mon, 18 Dec 2023 14:36:10 +0100 Subject: [PATCH 3/5] removing more getLink stuff --- src/main/config/run.properties.example | 2 +- .../java/org/icatproject/ids/IdsBean.java | 10 +------- .../org/icatproject/ids/PropertyHandler.java | 5 ---- src/main/java/org/icatproject/ids/Tidier.java | 24 ------------------- src/test/resources/one.properties | 2 +- src/test/resources/two.properties | 2 +- src/test/resources/twodf.properties | 2 +- 7 files changed, 5 insertions(+), 42 deletions(-) diff --git a/src/main/config/run.properties.example b/src/main/config/run.properties.example index 28f93f3a..1155abed 100644 --- a/src/main/config/run.properties.example +++ b/src/main/config/run.properties.example @@ -37,7 +37,7 @@ tidyBlockSize = 500 !filesCheck.errorLog = ${HOME}/ids/errorLog # JMS Logging -log.list = READ WRITE INFO LINK MIGRATE PREPARE +log.list = READ WRITE INFO MIGRATE PREPARE # JMS - uncomment and edit if needed !jms.topicConnectionFactory = java:comp/DefaultJMSConnectionFactory diff --git a/src/main/java/org/icatproject/ids/IdsBean.java b/src/main/java/org/icatproject/ids/IdsBean.java index b7d15084..5d226361 100644 --- a/src/main/java/org/icatproject/ids/IdsBean.java +++ b/src/main/java/org/icatproject/ids/IdsBean.java @@ -125,7 +125,7 @@ public Void call() throws Exception { } enum CallType { - INFO, PREPARE, READ, WRITE, MIGRATE, LINK + INFO, PREPARE, READ, WRITE, MIGRATE }; public class RestoreDfTask implements Callable { @@ -472,10 +472,6 @@ public static void validateUUID(String thing, String id) throws BadRequestExcept private ICAT icat; - private Path linkDir; - - private boolean linkEnabled; - private MainStorageInterface mainStorage; private Path markerDir; @@ -1432,8 +1428,6 @@ private void init() { datatypeFactory = DatatypeFactory.newInstance(); preparedDir = propertyHandler.getCacheDir().resolve("prepared"); Files.createDirectories(preparedDir); - linkDir = propertyHandler.getCacheDir().resolve("link"); - Files.createDirectories(linkDir); rootUserNames = propertyHandler.getRootUserNames(); readOnly = propertyHandler.getReadOnly(); @@ -1464,8 +1458,6 @@ private void init() { } } - linkEnabled = propertyHandler.getLinkLifetimeMillis() > 0; - maxIdsInQuery = propertyHandler.getMaxIdsInQuery(); threadPool = Executors.newCachedThreadPool(); diff --git a/src/main/java/org/icatproject/ids/PropertyHandler.java b/src/main/java/org/icatproject/ids/PropertyHandler.java index 7043adf8..bd9d2654 100644 --- a/src/main/java/org/icatproject/ids/PropertyHandler.java +++ b/src/main/java/org/icatproject/ids/PropertyHandler.java @@ -55,7 +55,6 @@ public static Logger getLogger() { private Path filesCheckLastIdFile; private int filesCheckParallelCount; private ICAT icatService; - private long linkLifetimeMillis; private MainStorageInterface mainStorage; @@ -308,10 +307,6 @@ public String getKey() { return key; } - public long getLinkLifetimeMillis() { - return linkLifetimeMillis; - } - public Set getLogSet() { return logSet; } diff --git a/src/main/java/org/icatproject/ids/Tidier.java b/src/main/java/org/icatproject/ids/Tidier.java index 8d0a8f82..ef1566dd 100644 --- a/src/main/java/org/icatproject/ids/Tidier.java +++ b/src/main/java/org/icatproject/ids/Tidier.java @@ -43,25 +43,6 @@ public void run() { try { cleanPreparedDir(preparedDir, preparedCount); - if (linkLifetimeMillis > 0) { - long deleteMillis = System.currentTimeMillis() - linkLifetimeMillis; - int n = 0; - for (File f : linkDir.toFile().listFiles()) { - Path p = f.toPath(); - - if (Files.getLastModifiedTime(p).toMillis() < deleteMillis) { - try { - Files.delete(p); - n++; - } catch (Exception e) { - logger.error(e.getClass() + " " + e.getMessage()); - } - } - } - if (n > 0) { - logger.debug("Deleted " + n + " links from " + linkDir); - } - } if (twoLevel) { if (storageUnit == StorageUnit.DATASET) { List dsInfos = mainStorage.getDatasetsToArchive(stopArchivingLevel, @@ -227,8 +208,6 @@ static void cleanPreparedDir(Path preparedDir, int preparedCount) throws IOExcep @EJB private FiniteStateMachine fsm; - private Path linkDir; - private long linkLifetimeMillis; private MainStorageInterface mainStorage; private Path preparedDir; @@ -263,9 +242,6 @@ public void init() { preparedCount = propertyHandler.getPreparedCount(); preparedDir = propertyHandler.getCacheDir().resolve("prepared"); Files.createDirectories(preparedDir); - linkDir = propertyHandler.getCacheDir().resolve("link"); - Files.createDirectories(linkDir); - linkLifetimeMillis = propertyHandler.getLinkLifetimeMillis(); mainStorage = propertyHandler.getMainStorage(); twoLevel = propertyHandler.getArchiveStorage() != null; key = propertyHandler.getKey(); diff --git a/src/test/resources/one.properties b/src/test/resources/one.properties index 1b7a006f..51a3f0cd 100644 --- a/src/test/resources/one.properties +++ b/src/test/resources/one.properties @@ -18,4 +18,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -log.list = READ WRITE INFO LINK MIGRATE PREPARE +log.list = READ WRITE INFO MIGRATE PREPARE diff --git a/src/test/resources/two.properties b/src/test/resources/two.properties index 2d391ddb..df1a7eb1 100644 --- a/src/test/resources/two.properties +++ b/src/test/resources/two.properties @@ -25,4 +25,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -log.list = READ WRITE INFO LINK MIGRATE PREPARE +log.list = READ WRITE INFO MIGRATE PREPARE diff --git a/src/test/resources/twodf.properties b/src/test/resources/twodf.properties index ce73a98b..22edec09 100644 --- a/src/test/resources/twodf.properties +++ b/src/test/resources/twodf.properties @@ -25,4 +25,4 @@ filesCheck.gapSeconds = 3 filesCheck.lastIdFile = ${HOME}/data/ids/lastIdFile filesCheck.errorLog = ${HOME}/data/ids/errorLog -log.list = READ WRITE INFO LINK MIGRATE PREPARE +log.list = READ WRITE INFO MIGRATE PREPARE From 501a3375538cb82b0f7bb06dbca01aca2771f5ae Mon Sep 17 00:00:00 2001 From: Rolf Krahl Date: Mon, 18 Dec 2023 14:51:07 +0100 Subject: [PATCH 4/5] Remove the value LINK also from the log.list documentation --- src/site/xhtml/installation.xhtml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xhtml/installation.xhtml.vm b/src/site/xhtml/installation.xhtml.vm index bb68f276..2fe72cf9 100644 --- a/src/site/xhtml/installation.xhtml.vm +++ b/src/site/xhtml/installation.xhtml.vm @@ -147,7 +147,7 @@
log.list
Optional. If present it specifies a set of call types to log via JMS calls. The types are specified by a space separated list of - values taken from READ, WRITE, LINK, MIGRATE, PREPARE and INFO.
+ values taken from READ, WRITE, MIGRATE, PREPARE and INFO.
jms.topicConnectionFactory
Optional. If present it overrides the default JMS connection From 53f169159014cbeb3386f9b6b2c2b66a70da561c Mon Sep 17 00:00:00 2001 From: Rolf Krahl Date: Mon, 18 Dec 2023 15:18:30 +0100 Subject: [PATCH 5/5] Update release notes --- src/site/xhtml/release-notes.xhtml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/site/xhtml/release-notes.xhtml b/src/site/xhtml/release-notes.xhtml index 3612b935..2d66fd4c 100644 --- a/src/site/xhtml/release-notes.xhtml +++ b/src/site/xhtml/release-notes.xhtml @@ -6,6 +6,11 @@

IDS Server Release Notes

+

3.0.0 (not yet released)

+
    +
  • #148: Drop getLink API call, deprecated in 2.0.0.
    • +
+

2.0.0

Make the transition to Payara 6