diff --git a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java index ddfba3534..52bd0d9b6 100644 --- a/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java +++ b/bitrepository-core/src/main/java/org/bitrepository/protocol/ProtocolComponentFactory.java @@ -31,11 +31,14 @@ import org.bitrepository.protocol.messagebus.MessageBusManager; import org.bitrepository.protocol.security.SecurityManager; import org.bitrepository.settings.referencesettings.ProtocolType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Provides access to the different component in the org.bitrepository.org.bitrepository.protocol module (Spring/IOC wannabe) */ public final class ProtocolComponentFactory { + private static final Logger log = LoggerFactory.getLogger(ProtocolComponentFactory.class); private static ProtocolComponentFactory instance; public static synchronized ProtocolComponentFactory getInstance() { @@ -84,7 +87,8 @@ public FileExchange getFileExchange(Settings settings) { } else if (protocolType == ProtocolType.HTTPS) { fileExchange = new HttpsFileExchange(settings); } else if (protocolType == ProtocolType.FILE) { - fileExchange = new LocalFileExchange(settings.getReferenceSettings().getFileExchangeSettings().getPath()); + fileExchange = new LocalFileExchange( + settings.getReferenceSettings().getFileExchangeSettings().getPath()); } } else { fileExchange = new HttpFileExchange(settings); diff --git a/bitrepository-integration/src/main/resources/quickstart/conf/integrityservice/ReferenceSettings.xml b/bitrepository-integration/src/main/resources/quickstart/conf/integrityservice/ReferenceSettings.xml index 4687a3d2d..41b3c4e2b 100644 --- a/bitrepository-integration/src/main/resources/quickstart/conf/integrityservice/ReferenceSettings.xml +++ b/bitrepository-integration/src/main/resources/quickstart/conf/integrityservice/ReferenceSettings.xml @@ -126,4 +126,10 @@ + + HTTP + localhost + 80 + /dav + diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java index 1684c283f..b2d405dc5 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/reports/BasicIntegrityReporter.java @@ -107,7 +107,7 @@ public void generateReport() throws IOException { private String generateSummary() { StringBuilder report = new StringBuilder(); if (deletedFilesCount != 0L) { - report.append("Detected ").append(deletedFilesCount).append(" files as removed from the collection."); + report.append("\n").append("Detected ").append(deletedFilesCount).append(" file(s) as removed from the collection."); } for (String pillar : missingFiles.keySet()) { if (missingFiles.get(pillar) != 0) { diff --git a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java index fab49ba3a..26f35e617 100644 --- a/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java +++ b/bitrepository-integrity-service/src/main/java/org/bitrepository/integrityservice/workflow/step/CreateStatisticsEntryStep.java @@ -31,8 +31,7 @@ import java.util.Map; /** - * A workflow step for finding missing checksums. - * Uses the IntegrityChecker to perform the actual check. + * A workflow step for creating pillar statistics. */ public class CreateStatisticsEntryStep extends AbstractWorkFlowStep { private final IntegrityModel store; @@ -51,8 +50,7 @@ public String getName() { } /** - * Uses IntegrityChecker to validate whether any checksums are missing. - * Dispatches an alarm if any checksums were missing. + * Collects pillar metrics for the given collection and creates from them a statistics entry in the store. */ @Override public synchronized void performStep() { diff --git a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java index 78064bfae..48c7cd918 100644 --- a/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java +++ b/bitrepository-reference-pillar/src/main/java/org/bitrepository/pillar/messagehandler/GetChecksumsRequestHandler.java @@ -213,12 +213,12 @@ private File makeTemporaryChecksumFile(GetChecksumsRequest request, } // Print all the checksums safely (close the streams!) - try (OutputStream is = new FileOutputStream(checksumResultFile)) { + try (OutputStream os = new FileOutputStream(checksumResultFile)) { JaxbHelper jaxb = new JaxbHelper(XSD_CLASSPATH, XSD_BR_DATA); String xmlMessage = jaxb.serializeToXml(results); jaxb.validate(new ByteArrayInputStream(xmlMessage.getBytes(StandardCharsets.UTF_8))); - is.write(xmlMessage.getBytes(StandardCharsets.UTF_8)); - is.flush(); + os.write(xmlMessage.getBytes(StandardCharsets.UTF_8)); + os.flush(); } return checksumResultFile; diff --git a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java index 1800faa18..49af499a9 100644 --- a/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java +++ b/bitrepository-service/src/main/java/org/bitrepository/service/contributor/handler/GetAuditTrailsRequestHandler.java @@ -202,12 +202,12 @@ protected File createAuditTrailFile(GetAuditTrailsRequest request, AuditTrailDat results.setCollectionID(request.getCollectionID()); results.getAuditTrailEvents().add(extractedAuditTrails.getAuditTrailEvents()); - try (OutputStream is = new FileOutputStream(checksumResultFile)) { + try (OutputStream os = new FileOutputStream(checksumResultFile)) { JaxbHelper jaxb = new JaxbHelper(XSD_CLASSPATH, XSD_BR_DATA); String xmlMessage = jaxb.serializeToXml(results); jaxb.validate(new ByteArrayInputStream(xmlMessage.getBytes(StandardCharsets.UTF_8))); - is.write(xmlMessage.getBytes(StandardCharsets.UTF_8)); - is.flush(); + os.write(xmlMessage.getBytes(StandardCharsets.UTF_8)); + os.flush(); } return checksumResultFile; diff --git a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebserviceInputChecker.java b/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebserviceInputChecker.java deleted file mode 100644 index 85d43cbd7..000000000 --- a/bitrepository-webclient/src/main/java/org/bitrepository/webservice/WebserviceInputChecker.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * #%L - * Bitrepository Webclient - * %% - * Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 2.1 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * #L% - */ -package org.bitrepository.webservice; - -import java.net.MalformedURLException; -import java.net.URL; - -public class WebserviceInputChecker { - - public static void checkFileIDParameter(String fileID) throws WebserviceIllegalArgumentException { - if(fileID == null || fileID.isEmpty()) { - throw new WebserviceIllegalArgumentException("Failure: missing fileID parameter."); - } - } - - public static void checkFileSizeParameter(String fileSize) throws WebserviceIllegalArgumentException { - if(fileSize == null || fileSize.isEmpty()) { - throw new WebserviceIllegalArgumentException("Failure: missing filesize"); - } - try { - Long.parseLong(fileSize); - } catch (Exception e) { - throw new WebserviceIllegalArgumentException("Failure: " + fileSize + " is not a valid number value"); - } - } - - public static void checkURLParameter(String URL) throws WebserviceIllegalArgumentException { - if(URL == null || URL.isEmpty()) { - throw new WebserviceIllegalArgumentException("Failure: missing url parameter."); - } - @SuppressWarnings("unused") - URL url; - try { - url = new URL(URL); - } catch (MalformedURLException e) { - throw new WebserviceIllegalArgumentException("Failure: malformed url parameter."); - } - } - - public static void checkChecksumTypeParameter(String checksumType) throws WebserviceIllegalArgumentException { - if(checksumType == null || checksumType.isEmpty()) { - throw new WebserviceIllegalArgumentException("Failure: missing checksumType parameter."); - } - // check for supported types? - } - - public static void checkPillarIDParameter(String pillarID) throws WebserviceIllegalArgumentException { - if(pillarID == null || pillarID.isEmpty()) { - throw new WebserviceIllegalArgumentException("Failure: missing pillarID parameter."); - } - } - - public static void checkChecksumParameter(String checksum) throws WebserviceIllegalArgumentException { - if(checksum != null && !checksum.isEmpty()) { - if((checksum.length() % 2) != 0) { - throw new WebserviceIllegalArgumentException("Failure: checksum parameter contains an uneven number of characters."); - } - if(!checksum.matches("^\\p{XDigit}*$")) { - throw new WebserviceIllegalArgumentException("Failure: checksum parameter contains a non hexadecimal value."); - } - } - } - - public static void checkSaltParameter(String salt) throws WebserviceIllegalArgumentException { - if(salt != null && !salt.isEmpty()) { - if((salt.length() % 2) != 0) { - throw new WebserviceIllegalArgumentException("Failure: salt parameter contains an uneven number of characters."); - } - if(!salt.matches("^\\p{XDigit}*$")) { - throw new WebserviceIllegalArgumentException("Failure: salt parameter contains a non hexadecimal value."); - } - } - } -} diff --git a/bitrepository-webclient/src/main/webapp/alarm-service.html b/bitrepository-webclient/src/main/webapp/alarm-service.html index 8091314a3..b723b77fa 100644 --- a/bitrepository-webclient/src/main/webapp/alarm-service.html +++ b/bitrepository-webclient/src/main/webapp/alarm-service.html @@ -42,7 +42,9 @@
-

Alarm service

+
+

Alarm service

+
Alarm display filters @@ -133,7 +135,7 @@