LMS-1442 screening bugfix: move mail parameters dto to common, introduce dependency checking

SVN: 15297

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/MailClientParameters.java → common/source/java/ch/systemsx/cisd/common/mail/MailClientParameters.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.generic.server;
+package ch.systemsx.cisd.common.mail;
 
 import java.io.Serializable;
 

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataSetCommandExecutor.java

@@ -27,6 +27,7 @@ import ch.systemsx.cisd.common.collections.ExtendedBlockingQueueFactory;
 import ch.systemsx.cisd.common.collections.IExtendedBlockingQueue;
 import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescription;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java

@@ -29,6 +29,7 @@ import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exceptions.InvalidAuthenticationException;
 import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.common.spring.AbstractServiceWithLogger;
 import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ArchiverTaskFactory;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/IDataSetCommandExecutor.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server;
 
 import java.util.List;
 
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescription;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ProcessDatasetsCommand.java

@@ -26,6 +26,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.mail.MailClient;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.IProcessingPluginTask;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ProcessingStatus;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatastoreServiceDescription;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java

@@ -45,6 +45,7 @@ import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.mail.MailClient;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.common.types.BooleanOrUnknown;
 import ch.systemsx.cisd.common.utilities.TokenGenerator;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;

datastore_server/source/java/dssApplicationContext.xml

@@ -20,6 +20,7 @@
     
     <bean id="plugin-tasks" class="ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.PluginTaskProviders" factory-method="create" />
 
+
     <bean id="openBIS-service" class="ch.systemsx.cisd.openbis.dss.generic.server.EncapsulatedOpenBISService">
         <constructor-arg ref="session-token-manager"/>
         <constructor-arg value="${server-url}"/>
@@ -38,7 +39,7 @@
             <bean class="ch.systemsx.cisd.openbis.dss.generic.server.DataStoreService">
                 <constructor-arg ref="session-token-manager" />
                 <constructor-arg>
-                    <bean class="ch.systemsx.cisd.openbis.dss.generic.server.MailClientParameters">
+                    <bean class="ch.systemsx.cisd.common.mail.MailClientParameters">
                         <property name="from" value="${mail.from}"/>
                         <property name="smtpHost" value="${mail.smtp.host}"/>
                         <property name="smtpUser" value="${mail.smtp.user}"/>

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServiceTest.java

@@ -33,6 +33,7 @@ import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
 import ch.systemsx.cisd.common.exceptions.InvalidAuthenticationException;
 import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.PluginTaskProviders;
 import ch.systemsx.cisd.openbis.dss.generic.shared.utils.PluginUtilTest;
 import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommandTest.java

@@ -48,6 +48,7 @@ import ch.systemsx.cisd.cifex.rpc.client.gui.IProgressListener;
 import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
 import ch.systemsx.cisd.common.logging.BufferedAppender;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;

screening/resource/dependency-structure.ddf

@@ -2,5 +2,38 @@
 
 {root} = ch.systemsx.cisd.openbis
 {screening} = ${root}.plugin.screening
+
+[screening_openbis] = ${screening}.*
 [private_openbis] = ${root}.* excluding ${root}.dss.generic.shared.* ${root}.generic.shared.*
+[dss] = ${root}.dss.* ch.systemsx.cisd.etlserver.*
+check sets [screening_openbis] [dss]
+
+check [screening_openbis] independentOf [dss]
+
+# -------- check internal screening structure
+
+[screening_shared] =  ${screening}.shared.*
+[screening_web] =  ${screening}.client.web.*
+[screening_server] =  ${screening}.server.*
+check sets [screening_shared] [screening_web] [screening_server]
+
+layer s_shared = [screening_shared]
+layer s_server = [screening_server]
+layer s_web_all = [screening_web]
+
+check layeringOf s_shared s_server s_web_all
+
+# --------
+
+[screening_web_client] =  ${screening}.client.web.client.application.*
+[screening_web_shared] =  ${screening}.client.web.client.* excluding [screening_web_client]
+[screening_web_server] =  ${screening}.client.web.server.*
+check sets [screening_web_client] [screening_web_shared] [screening_web_server]
+
+layer s_web_shared = [screening_web_shared]
+layer s_web = [screening_web_server] [screening_web_client]
+
+check layeringOf s_web_shared s_web
+check [screening_web_client] independentOf [screening_server]
+
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/LibraryRegistrationTask.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.mail.MailClient;
-import ch.systemsx.cisd.openbis.dss.generic.server.MailClientParameters;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewMaterial;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSamplesWithTypes;

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java

@@ -29,9 +29,9 @@ import javax.servlet.http.HttpSession;
 import org.springframework.stereotype.Component;
 
 import ch.rinn.restrictions.Private;
+import ch.systemsx.cisd.common.mail.MailClientParameters;
 import ch.systemsx.cisd.common.servlet.IRequestContextProvider;
 import ch.systemsx.cisd.common.spring.IUncheckedMultipartFile;
-import ch.systemsx.cisd.openbis.dss.generic.server.MailClientParameters;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns.specific.GenericTableRowColumnDefinition;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentIdentifier;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GenericTableResultSet;

screening/source/java/screening-applicationContext.xml

@@ -12,7 +12,7 @@
     <!--
         //Mail Client Parameters
     -->
-    <bean id="mail-client-parameters" class="ch.systemsx.cisd.openbis.dss.generic.server.MailClientParameters">
+    <bean id="mail-client-parameters" class="ch.systemsx.cisd.common.mail.MailClientParameters">
         <property name="from" value="${mail.from}"/>
         <property name="smtpHost" value="${mail.smtp.host}"/>
         <property name="smtpUser" value="${mail.smtp.user}"/>