From aa721dac4cb513f503216af536b1ec60d751c383 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 23 Sep 2014 13:00:34 +0000
Subject: [PATCH] SSDM-351: Implement a queue for all asynchronous registartion
from openbis UI (big refactoring)
SVN: 32485
---
.../generic/client/web/server/CommonClientService.java | 4 ++--
.../generic/client/web/server/queue/ConsumerQueue.java | 4 ++--
.../generic/client/web/server/queue/ConsumerTask.java | 2 +-
.../generic/client/web/server/GenericClientService.java | 4 ++--
openbis/source/java/genericApplicationContext.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/client/web/server/queue/ConsumerQueue.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => }/generic/client/web/server/queue/ConsumerTask.java (95%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index 66fecaa4d28..2609af98340 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -220,8 +220,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.parser.BisTabFileLoader;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerTask;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
/**
* The {@link ICommonClientService} implementation.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
index 2b127e3f8cc..b6a0c301afa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerQueue.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerQueue.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue;
+package ch.systemsx.cisd.openbis.generic.client.web.server.queue;
import java.io.StringWriter;
import java.util.Date;
@@ -62,7 +62,7 @@ public final class ConsumerQueue
final IMailClient mailClient = new MailClient(mailClientParameters);
sendEmail(mailClient, writer.toString(), getSubject(consumerTask.getName(), startDate, success), consumerTask.getUserEmail());
} catch(Throwable anyErrorOnMail) {
- operationLog.error("Could not send email about asynchronous action '" + consumerTask.getName() + "' result. ", anyErrorOnMail);
+ operationLog.error("Asynchronous action '" + consumerTask.getName() + "' failed. ", anyErrorOnMail);
}
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
index 40faa04b375..e5c95d0229a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/queue/ConsumerTask.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/queue/ConsumerTask.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue;
+package ch.systemsx.cisd.openbis.generic.client.web.server.queue;
import java.io.IOException;
import java.io.Writer;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
index 4dcb613e6ee..a2e682eb702 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/server/GenericClientService.java
@@ -92,8 +92,8 @@ import ch.systemsx.cisd.openbis.generic.shared.parser.SampleUploadSectionsParser
import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.IGenericClientService;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.parser.MaterialUploadSectionsParser;
import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.parser.MaterialUploadSectionsParser.BatchMaterialsOperation;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue;
-import ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerTask;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue;
+import ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerTask;
import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
diff --git a/openbis/source/java/genericApplicationContext.xml b/openbis/source/java/genericApplicationContext.xml
index a9a18ac6481..0af786405f4 100644
--- a/openbis/source/java/genericApplicationContext.xml
+++ b/openbis/source/java/genericApplicationContext.xml
@@ -198,7 +198,7 @@
<property name="maxResults" value="${hibernate.search.maxResults}" />
</bean>
- <bean id="registration-queue" class="ch.systemsx.cisd.openbis.plugin.generic.client.web.server.queue.ConsumerQueue">
+ <bean id="registration-queue" class="ch.systemsx.cisd.openbis.generic.client.web.server.queue.ConsumerQueue">
<constructor-arg ref="mail-client-parameters" />
</bean>
--
GitLab