diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
index c7d784f1409fc6eabe8374bcfefa3e34d9f5ce0c..1f8a9be1dee7c38f5b1c157c68fdc045e289d931 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
@@ -93,7 +93,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTermWithStats
  * unexpected exception.
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICommonClientService extends IClientService
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
index b080ad2a4dca0ecf7211244b948052f2b1ec380a..a5447995c05233183b5d76e0528608809faf70b3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
@@ -90,7 +90,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.VocabularyTermWithStats
 /**
  * Asynchronous version of {@link ICommonClientService}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICommonClientServiceAsync extends IClientServiceAsync
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java
index e44443bfcd55e18f38e633137e7940e5181d78e1..ac0db176286a91ce59eef2e6b393d292cc19d510 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AbstractAsyncCallback.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.exception.InvalidSessi
  * Abstract super class of call backs. Subclasses have to implement {@link #process(Object)}. Note,
  * that instances of this class and its subclasses are stateful and can not be reused.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractAsyncCallback<T> implements AsyncCallback<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/BrowserSectionPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/BrowserSectionPanel.java
index 240256e6e85612c887b4a1e55bcff827e4dc14fd..ee07ede2c4bd1116c3207841766fdcba1f5ca375 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/BrowserSectionPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/BrowserSectionPanel.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.ID
 /**
  * Panel of a details view showing data in a browser (i.e. table).
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class BrowserSectionPanel extends SingleSectionPanel
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java
index 12969bf903be669c665d0a01a879d9b70109f143..2229fcbf993846525668fed57a24ce68f22af906 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Client.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ApplicationInfo;
 /**
  * The {@link EntryPoint} implementation.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Izabela Adamczyk
  */
 public class Client implements EntryPoint
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java
index 7c5640de932dffe8e5ede569376a194f42cef4d9..989b5ce84c0a9fbed19684b09ab37c24fd6b174e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/CommonViewContext.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
 /**
  * The <i>generic</i> {@link IViewContext} implementation.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class CommonViewContext implements IViewContext<ICommonClientServiceAsync>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
index 7094f39ad0f0ddf7938be70cbd74e484c94c2e63..dbee3926e20ea17a9b24d85e8c949fef4ddef919 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericConstants.java
@@ -21,7 +21,7 @@ import com.google.gwt.core.client.GWT;
 /**
  * Some generic constants.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class GenericConstants
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java
index aedf1259417b0795363b9ac652d06178d29dec66..c513f4514e8c0dc87e24e08e331251135c685cbe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/GenericViewModel.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
 /**
  * The view model.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class GenericViewModel
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java
index 219ba6e3f80bfb765d768b229075806242d35668..a34ea881a4bdbd5938e527dd4ba8b8a771a09ea4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ICallbackListener.java
@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
 /**
  * Listener of invocations of methods of {@link AsyncCallback}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICallbackListener<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java
index 15f4f2bda1f5ed09a8434457cd4c13f556e1f7af..d1e2e7bb4db6a76c7a7e4ccaf3cfbbcb28af4298 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IGenericImageBundle.java
@@ -25,7 +25,7 @@ import com.google.gwt.user.client.ui.ImageBundle;
  * Note that this approach does not render correctly animated <i>gif</i> (no animation!).
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IGenericImageBundle extends ImageBundle
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java
index 9d74ed7b782a5bb3ed4e5abbc05d300dbd67945c..acc0c603a490c38550184a9f33e66a53a98d2beb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/IPageController.java
@@ -24,7 +24,7 @@ import com.extjs.gxt.ui.client.mvc.Dispatcher;
  * This controller lies on top of the ones specified in {@link Dispatcher}.
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IPageController
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SessionContextCallback.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SessionContextCallback.java
index 97ba5b9c0093b1ff500c83eed17dd7b82a30eab8..a295cb6c1f89fe91e870b993b788040b05d7bf27 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SessionContextCallback.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SessionContextCallback.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
  * Callback class which handles return value
  * {@link ICommonClientService#tryToGetCurrentSessionContext()}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class SessionContextCallback extends AbstractAsyncCallback<SessionContext>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
index 4f8684bc1129545fc0069a4975b1ecfacc0ce8b8..f9547c1aaa326cf598765c815a8d1e2deccca2b5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplaySettingsManager.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
  * singletons. The display setting manager will be created as often as components to be managed are
  * created.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DisplaySettingsManager
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
index 35948cc6a4ec7e5b0f4399e9f75c526d920fd1f6..64b7ca2658fa99e05291c605399be72f9d64f367 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/DisplayTypeIDGenerator.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
 /**
  * Enum for all generic {@link IDisplayTypeIDGenerator}s.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum DisplayTypeIDGenerator implements IDisplayTypeIDGenerator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java
index d97f94c70e3743209e8d06ac68ac8079ef6d8b5c..16302efc7de9af67dae1cbf651f74ccce3a51d59 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplaySettingsGetter.java
@@ -23,7 +23,7 @@ import com.extjs.gxt.ui.client.widget.grid.ColumnModel;
 /**
  * The interface with which {@link DisplaySettingsManager} gets the current settings.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDisplaySettingsGetter
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java
index c8fa7107b43f7d1174875f3dcc0b927136ab53ab..6c5113a9c2e2d53915dca548401fefbd0ce1003b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IDisplayTypeIDGenerator.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
 /**
  * Generator of diplay type ID as used by {@link DisplaySettingsManager}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDisplayTypeIDGenerator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IUpdater.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IUpdater.java
index 9c882025b7d6e48d08f2ad4436ccc01a2b901539..8b70a047dae05d79cbfce7cc8b826c1980677de7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IUpdater.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/framework/IUpdater.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.framework
 /**
  * Interface of something which performs an update of something
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IUpdater
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
index acaf3b4d762f5420c27aab1f2119802aab49fa66..e6f972845f98c0638c063f4040b30c08b0b3fd77 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/menu/TopMenu.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMess
 /**
  * Implements functionality of the top menu.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Izabela Adamczyk
  */
 public class TopMenu extends LayoutContainer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
index 100a2dc342b1c21e7db931974e9ccda569f68758..09692d72ec0a5529a21bb28b56f123f75efa0c2c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/BaseEntityModel.java
@@ -41,7 +41,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
  * The generic model which can be created automatically using the array of
  * {@link IColumnDefinitionKind} or {@link IColumnDefinition}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Tomasz Pylak
  */
 public class BaseEntityModel<T> extends BaseModelData
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
index 3dd95de4ad6480a16e7f357554909776973735d2..f0e7e07636293011a29ca869f5790dc16b602c1f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/LinkRenderer.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Base
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.InlineHyperlink;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Piotr Buczek
  */
 public class LinkRenderer
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
index 1f18b8d591aebf3d69bad3042f7575ad3af3e70f..f5a75005958ffe78b892e61b973583bb6bb3dbde 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/renderer/YesNoRenderer.java
@@ -11,7 +11,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.columns
  * Renderer of {@link Boolean} value. Render <code>true</code> to <code>yes</code> and
  * <code>false</code> to <code>no</code>.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class YesNoRenderer implements GridCellRenderer<ModelData>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
index 665d432017ffc4c1e2f9820c110d8b4bab0df9bc..9a2decafc77be29799b3dcde4a2b5e14e183cc6b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractViewer.java
@@ -51,7 +51,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractViewer<T extends IClientServiceAsync, D extends IEntityInformationHolder>
         extends ContentPanel
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java
index 1bcc4b5bdcadb5d913bb531719471a8be8864fd4..9849f8d1598a37be8ebf7a577d1186d94897754e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/LoginWidget.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.SessionContext;
 /**
  * The login widget.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class LoginWidget extends VerticalPanel
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java
index 6d9a9bd145dd97ad4445ded45b676139fbf66fef..3f83e9815bf8ed072f0e18bd73562d232b96f322 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddGroupDialog.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IDele
 /**
  * {@link Window} containing group registration form.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Izabela Adamczyk
  */
 public class AddGroupDialog extends AbstractRegistrationDialog
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/AbstractColumnDefinitionKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/AbstractColumnDefinitionKind.java
index bffde679c39e8f5da108940350b47ed8020d1b9a..6ce071a608285829258dd48fc403026186a21269 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/AbstractColumnDefinitionKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/AbstractColumnDefinitionKind.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
  * are similar, but cannot extend a class directly (they are enums, not classes).
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractColumnDefinitionKind<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/CommonColumnDefinition.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/CommonColumnDefinition.java
index 08c5a0c7113a72d4b7c8476b4e55a1d3b93ea0b8..d7eef115707a3f58fb26cb51dbc019d3fa0d0b8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/CommonColumnDefinition.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/CommonColumnDefinition.java
@@ -21,7 +21,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.column
  * render each column value.
  * 
  * @author Tomasz Pylak
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class CommonColumnDefinition<T> extends AbstractColumnDefinition<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionKind.java
index f44e506a2d692497bfbb94f4c40c11f32187109e..6d87ad34517525ea073a94f0e3ae1df8f750645f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/framework/IColumnDefinitionKind.java
@@ -22,7 +22,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 /**
  * Column rendering data provider and cell rendering for tables with rows of type <code>T</code>.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IColumnDefinitionKind<T> extends IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/TypeColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/TypeColDefKind.java
index bd5e79ba2b44e753f44ee05c691b86667156f980..a98b8fc42fc72d231361af1da7359ee88b42ed18 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/TypeColDefKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/TypeColDefKind.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractType;
 /**
  * Generic columns for a grid of types.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum TypeColDefKind implements IColumnDefinitionKind<AbstractType>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
index f02274600eec4585dcdf55fbecebb7e684ec1ccc..8ccf1b513bba3807a05b884c15d82b2fc42aa13a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/columns/specific/data/CommonExternalDataColDefKind.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum CommonExternalDataColDefKind implements IColumnDefinitionKind<ExternalData>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
index 70e7a1eadc9034b62fd1360387796705a22f2c9e..b61b65b8826f977fc046c427ac61c802b4d0bcfb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/AbstractExternalDataGrid.java
@@ -68,7 +68,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.PropertyType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractExternalDataGrid
         extends
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
index a7dc6dcb72e2ec97548aa8cf9ff21cda58eb1fb0..73a04a64bc62d2e36128915c9d25fb454bd1e4d1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetUploadConfirmationDialog.java
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 final class DataSetUploadConfirmationDialog extends AbstractDataConfirmationDialog<List<ExternalData>>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
index 74d01d1f52b3e6650b58a5f65dc5e5b740156faa..16f98bdc0009b157810197592b50f4fdc9443cad 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/FileFormatTypeGrid.java
@@ -56,7 +56,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKin
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class FileFormatTypeGrid extends AbstractSimpleBrowserGrid<AbstractType>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntityListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntityListener.java
index 0489793e511dccfb9993e5a305ab6a999414bd4a..d4117e499047688c6244ef7f404f1d365730a3f7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntityListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/IChosenEntityListener.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IChosenEntityListener<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
index e279f86acb2aea60f6509c5ffd6ba647e7020ffb..262e3200cbd2307f8e24c2d4fc0faabfa90eb0ff 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ColumnListener.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Base
  * Listener for a Grid which delegates click on a cell or link in a cell to a registered
  * {@link ICellListener}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class ColumnListener<T, M extends BaseEntityModel<T>> implements Listener<GridEvent>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java
index fdf690b4ef6f50f9e59b48e4009b7daa0ae9e4fa..6ca18410e0c778b596874903f8a4f7d346a65291 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/ICellListener.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid;
 /**
  * Listener interface for classes which could handle event on a cell of a grid.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICellListener<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
index ceb6b80c97fbb6f4dd8bc00ce71afe3b98cbb3dd..00bf0ebe8a71c07f376bc488738492abbae393d8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DataSetUtils.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.URLMethodWithParameters;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetUtils
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java
index ffc6b1c4bf94dec16b9c52fd222e11b31c395240..69e15b95e6440e5cda8aa5368d58fa320c817216 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/DictonaryBasedMessageProvider.java
@@ -25,7 +25,7 @@ import com.google.gwt.i18n.client.Dictionary;
  * Message provider based on a {@link Dictionary} instance. The messages are dynamically loaded at
  * runtime from a JavaScript file.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class DictonaryBasedMessageProvider implements IMessageProvider
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java
index 03c84aff3edb768d42c1192e7e6d8e35e6bf050c..a9824d34a66557ffce985cde5752ee30c7ff4eb0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/util/IMessageProvider.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.util;
 /**
  * Interface of objects providing messages.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IMessageProvider
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
index ce4b50f6cf65a72de37352504ddd59f6b1f017d9..f513d363795d8cfe4973730ac776550167462b8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/ApplicationInfo.java
@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 /**
  * A bean that contains information about the application.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class ApplicationInfo implements IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java
index a2a91d22e7fb639c1f595065ae24df94b92774b2..74e744e9ad50fb47d1c58b4aaecf7800b6702730 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/DataSetUploadParameters.java
@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetUploadParameters implements IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java
index 25c28488891e0646945addbb67b64df7c27ab96e..577be5da932b3d52e8a8a6ff3672d1cc9bf44058 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/SessionContext.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
 /**
  * Context of a web session. Contains session ID, {@link User}, and {@link DisplaySettings}. 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class SessionContext implements IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java
index 50cf1e140b00339391624db9890e665d66337217..b28f293335e61614524340f65b743869dd09bc4a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/dto/User.java
@@ -21,7 +21,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 /**
  * User information to be shown in Web client.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class User implements IsSerializable
 {
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 5e50be20dd133ba9c3748cd4c0407d121edaea5c..92c2e8b40335170b12419443eee0568f1a07950f 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
@@ -138,7 +138,7 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTermTranslat
 /**
  * The {@link ICommonClientService} implementation.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class CommonClientService extends AbstractClientService implements
         ICommonClientService, IDataStoreBaseURLProvider
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java
index f5722d8565b2a9e2abf8ec0747c7c4b0cdffb0e2..93a37f6df80961355092f4302da786a76e800833 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/translator/UserFailureExceptionTranslator.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureE
  * Translator of server side {@link ch.systemsx.cisd.common.exceptions.UserFailureException} into
  * GWT compatible {@link UserFailureException}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class UserFailureExceptionTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index 2e1bd132af1f5678e7d25efb36717183452e5345..463644c893b2b4dbe9fc54395c266b726084bd2e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -180,7 +180,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 /**
  * Implementation of client-server interface.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class CommonServer extends AbstractServer<ICommonServer> implements ICommonServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java
index 78f7e566774d4b2f90f02dae63d7a86a0f473205..3d10597553858f62fdb8cf7a57a55ce4611289a6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServerLogger.java
@@ -91,7 +91,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 /**
  * Logger class for {@link CommonServer} which creates readable logs of method invocations.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 final class CommonServerLogger extends AbstractServerLogger implements ICommonServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
index 762d36e8caa95c84c82a2ef7f9f476d11d6e2dee..89c4075a681402bf0f8c07c327b63d7b1733aeb2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java
@@ -73,7 +73,7 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.ExperimentTranslator.L
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ETLService extends AbstractServer<IETLService> implements IETLService
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
index 4004494db8239c7933b89a3ff7475e27969a724d..fe36a21cba28d02dc7c87a47c9781128c257e815 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ETLServiceLogger extends AbstractServerLogger implements IETLService
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
index f576fb7e68c6d90345ab1982bf3ac954be21647b..aff7d2c63e1acbd41812e798bcfb23a35e6e0bea 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceServer.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
 import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Controller
 @RequestMapping(
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IETLService.java
index 6f485517d4146e34eaa3ac114590c653bd0bf28b..d725161077d9979f9014231f8e333ce96453ff77 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IETLService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IETLService.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IETLService extends IETLLIMSService, IServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/LogMessagePrefixGenerator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/LogMessagePrefixGenerator.java
index 4ba1e664daa2f6c26b19cd60a45f0081de786f4c..fe47cb36a54ba115051a23f407561c3836255ea2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/LogMessagePrefixGenerator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/LogMessagePrefixGenerator.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 /**
  * Log message prefix generator based on user information found in a {@link Session} object.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class LogMessagePrefixGenerator implements ILogMessagePrefixGenerator<Session>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java
index edcab988770b5150b705c2d27bfbbc46ee45c7ca..473ab009390e68d121299a1235ee1accade1284a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/SessionFactory.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 /**
  * Factory of {@link Session} objects.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class SessionFactory implements ISessionFactory<Session>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
index 82ded565ba17b842b260f37e316f0708b81464cc..be9f9153e384cb33aa92e11a3ec99f3321944b1c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/DataStoreServiceFactory.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
 /**
  * Factory of cached {@link IDataStoreService} instances.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataStoreServiceFactory implements IDataStoreServiceFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java
index 695b9ac97c25821c58424111351dc582101c789b..780642c3ae69f643e7dbe7e0cec2ed472a8ff407 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IDataStoreServiceFactory.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IDataStoreService;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataStoreServiceFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
index f099bdc127c17d65ed0c527b28b05f57e6d6ce72..14cbf5d9df0f237ce09b22e4251e1fef59850c6d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
@@ -59,7 +59,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 /**
  * An <code>abstract</code> <i>Business Object</i>.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 abstract class AbstractBusinessObject implements IDAOFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractExternalDataBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractExternalDataBusinessObject.java
index 0f291b4bd35fdd1cc25eb8d1dd89edf11812749e..da587325932631a5d136a76dfdd39126988e93e6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractExternalDataBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractExternalDataBusinessObject.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractExternalDataBusinessObject extends
         AbstractSampleIdentifierBusinessObject
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBO.java
index 8b63095f87cb9455d1b778e7e6e48394782d0dc9..256fa811d390334bb43a40e8fdfa28f018c1bfdd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExternalDataBO.java
@@ -61,7 +61,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.types.DataSetTypeCode;
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Friend(toClasses = DataPE.class)
 public class ExternalDataBO extends AbstractExternalDataBusinessObject implements IExternalDataBO
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java
index b1b092d5903db529400e7e210293415b47929c56..96589f5bb0a05e42682622ce86acc1bf3dbdc85c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IBusinessObject.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
 /**
  * Common method(s) all Business Objects and Tables have to implement.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IBusinessObject
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataBO.java
index 7f3589f8e5996c62197cf8e4faa13e8e90216e78..41f5d8d94f71e7c1a6274a42816f0c6230423c80 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IExternalDataBO.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.NewExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IExternalDataBO extends IEntityBusinessObject
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java
index 16d937ac41ad8ff2d190005f8a8c6e76f399509c..434caafed8f98201202a796ddd91634100c2abf3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/AbstractDAO.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.DatabaseInstanceTransl
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java
index e5157d63a718f0fdd152be7c5ff5cbc27f7a55ec..e80f3d8685df41071b407a813516276c3d08f608 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertiesHolderResolver.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityPropertiesHolder
 /**
  * Resolver of objects holding entity properties.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IEntityPropertiesHolderResolver
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java
index 858c5714e780a328df9524435b0ad97d92b141a0..9f3dcb1054a0cfe63ea4cc3a1f1c706b12546303 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/common/IEntityPropertySetListingQuery.java
@@ -21,7 +21,7 @@ import it.unimi.dsi.fastutil.longs.LongSet;
 /**
  * Query methods for retrieving entity properties.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IEntityPropertySetListingQuery
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java
index 445a53d8131d0640145ea2c6a28744ab3d16276a..fcda250d706933ae5082ac65153ca8eeb4bc82a1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/importer/DatabaseInstanceImporter.java
@@ -54,7 +54,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames;
 /**
  * Class which allows to import another database instance.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DatabaseInstanceImporter
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
index 70ab8b24eace326c92b36779293e64e985af7af0..b10e1eb5f2f63d229541ff540060c26932b489b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAttachmentDAO.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.AttachmentPE;
 /**
  * Data access object for managing persistency of {@link AttachmentPE} instances.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IAttachmentDAO extends IGenericDAO<AttachmentPE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java
index 21bd87debcbae279f568548a58a3f9fb403c4639..4a10c611135aecaa2600783fddb1145686cdbad6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IAuthorizationDAOFactory.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 /**
  * Factory definition for all Data Access Objects which are needed for managing authorization.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IAuthorizationDAOFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
index 8cf05f12255e6a0670f5c4d869b3b0ec4ce91a9a..d5d182b8b205428319652079cd628618d8a08ceb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 /**
  * A <i>Data Access Object</i> factory.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDAOFactory extends IAuthorizationDAOFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java
index d0bc2a6e96a7d92a5fc9e78b67704d7367c49e7a..4c06f67b7b939849659c80a186844917120cf1f3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataSetTypeDAO.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
 /**
  * Interface to the data access layer for retrieving instances of {@link DataSetTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataSetTypeDAO extends IGenericDAO<DataSetTypePE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java
index 0f3671393cadccefed2f2d2fc665c5f8f7dfaa5c..776fa4afe03cf962668937a9430d41665a71bbfd 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDataStoreDAO.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
 /**
  * <i>Data Access Object</i> for {@link DataStorePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataStoreDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java
index c46e4e4129ad35c85cee69ba1e3487a814f0bccd..6d6e917ce3293ce66714b0ac5427e002654ef870 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IEntityTypeDAO.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
  * Interface to the data access layer for retrieving instances of {@link EntityTypePE}.
  * Implementations may depend on the {@link EntityKind}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IEntityTypeDAO extends IGenericDAO<EntityTypePE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
index d57c7e5169ec59384230030b0a828626da846a15..ddc3a441db2a23f9bf0cd2acf409a826a05f2b5e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IExperimentDAO.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
 /**
  * <i>Data Access Object</i> for {@link ExperimentPE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IExperimentDAO extends IGenericDAO<ExperimentPE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java
index ef9e8eb43641b05cae5a29e0197ce543e4317195..6c5f5e3002eb9364c67ddbda530dc54e1d650208 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IFileFormatTypeDAO.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.FileFormatTypePE;
 /**
  * Interface to the data access layer for retrieving instances of {@link FileFormatTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IFileFormatTypeDAO extends IGenericDAO<FileFormatTypePE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java
index 919366d4763aae305b9d50e2b04f2c6060729d68..9bf7ff591f222d36a4300dc973ea74378f29112a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/ILocatorTypeDAO.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE;
 /**
  * Interface to the data access layer for retrieving instances of {@link LocatorTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ILocatorTypeDAO extends IGenericDAO<LocatorTypePE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
index ec92e2a7ab88632e1cb59611f1313e9dd334b76f..3bf38d6fe104676f8f5ebc36904ee2094a6a9832 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IPersonDAO.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 /**
  * <i>Data Access Object</i> for persons.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IPersonDAO extends IGenericDAO<PersonPE>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
index 6ebcf5a1ffb09fc9f2daf80557301a1e6ada1563..45b42fd656993e6321f2aeb372ab65e2e3941acb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/PersistencyResources.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext;
 /**
  * Resources needed to create DAO's.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class PersistencyResources
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
index 0e6a85a7ddd339b4ae0b9e00ffcae49a2ee02841..94b0e8fb1e6ffa5754ff0047b11854a6417d70df 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AttachmentDAO.java
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 /**
  * Implementation of {@link IAttachmentDAO} for data bases.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Tomasz Pylak
  */
 final class AttachmentDAO extends AbstractGenericEntityDAO<AttachmentPE> implements IAttachmentDAO
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
index 5514a601984e09d27f864cd9a342c3d90335e07d..911c6138264a50c2977bc2eaa4fbbcd20d0d074e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/AuthorizationDAOFactory.java
@@ -44,7 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.UuidUtil;
 /**
  * Super class of all DAO factories which extend {@link IAuthorizationDAOFactory}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class AuthorizationDAOFactory implements IAuthorizationDAOFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
index 99a1a2c873d493b0a5e8e6c7fcd896b040bd0ae1..165e0ae08483460ae7bc16690eb8451f55465d9b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java
@@ -45,7 +45,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
  * {@link IDAOFactory} implementation working with {@link DatabaseConfigurationContext} and
  * {@link SessionFactory}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFactory
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java
index e6d65e0e9a4b731ba2c9080f12d30bcfef313cbe..fb1d51d2c12eb00b2848cc069e6306d59591a7a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataSetTypeDAO.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 /**
  * Data access object for {@link DataSetTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetTypeDAO extends AbstractTypeDAO<DataSetTypePE> implements IDataSetTypeDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java
index 8bcb00005c9a0d24f4777f2acad8cf40b9f6ab61..5ccc6780b76432052b560d0ec5ce1d54187a2102 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DataStoreDAO.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 /**
  * Hibernate-based implementation of {@link IDataStoreDAO}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataStoreDAO extends AbstractDAO implements IDataStoreDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java
index 94af1aaf1bf42e772577312cbc883b50a2e7b9b9..c56bb942d5f5a3671bd5bd8ad4661a00e3ab732c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DatabaseAndIndexReplacer.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.common.logging.LogInitializer;
  * Helper application which replaces a database and its Lucene index by another existing database and
  * its index.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DatabaseAndIndexReplacer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
index 890ae90eed2cfe51cb31c3e3e25b65830a6aec10..324fb5823903b17f2f05ff3f0a211905ffcf7dc4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityTypeDAO.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
 /**
  * Database based implementation of {@link IEntityTypeDAO}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 final class EntityTypeDAO extends AbstractTypeDAO<EntityTypePE> implements IEntityTypeDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
index caa7bf8614f2db35db09e3f535c2376415bfce69..851b798ce7571dd9e54dcb33901b0abeeaccced1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/FileFormatTypeDAO.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.FileFormatTypePE;
 /**
  * Data access object for {@link FileFormatTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class FileFormatTypeDAO extends AbstractTypeDAO<FileFormatTypePE> implements
         IFileFormatTypeDAO
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java
index 6ab81ab7ce074f5fcbe862ee6bead7edc0af2715..01b34c854c3a93155f68f2cd409ea73faf9355b1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/LocatorTypeDAO.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.LocatorTypePE;
 /**
  * Data access object for {@link LocatorTypePE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class LocatorTypeDAO extends AbstractTypeDAO<LocatorTypePE> implements ILocatorTypeDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
index 953d72eed2ccffdbfbd742fa3d963fa0020e291d..0286507064b6d5f22f8f11cf363518a5f3d1e8a0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 /**
  * Implementation of {@link IPersonDAO} for databases.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class PersonDAO extends AbstractGenericEntityDAO<PersonPE> implements IPersonDAO
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
index 91dad818f8c073e2af9de16ca8dae9089c006375..a6e74cd0c877008b5015be44b1731ba8f357afd0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SequenceNameMapper.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames;
  * A small <code>StandardSequenceNameMapper</code> which can handle sequencers that are not
  * constructed the standard way.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class SequenceNameMapper extends StandardSequenceNameMapper
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
index da0c787c4fe8becdc1111b8e1adf5e9d58c478f4..4831a2cb8ebb13ea925aef987d42b1685b96b596 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/AbstractPluginRegistry.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePE;
  * </p>
  *
  * @author Christian Ribeaud
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 abstract class AbstractPluginRegistry<P extends IServerPlugin> implements BeanFactoryAware
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
index 2b62f8f706e5fa8919f50925ffc5880e6cf001e9..ed615ff573e6cf808a8d685487e1b632fcbb697c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/DataSetServerPluginRegistry.java
@@ -30,7 +30,7 @@ package ch.systemsx.cisd.openbis.generic.server.plugin;
  * making sure that we have one and only one instance of this class.
  * </p>
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetServerPluginRegistry extends AbstractPluginRegistry<IDataSetServerPlugin>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
index 86b7de36c4dac52f4cfeb9efd49f1e4dabfd0c77..9cf5c3efe0e5591ab04b98edc8d5b4236e8cfa80 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetServerPlugin.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.server.plugin;
 /**
  * Plug-in interface for data sets.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataSetServerPlugin extends IServerPlugin
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
index ec7371359f26166e4617162cb61ce07b74730106..aaea9d5ec3fd903caa8621077af6f0591bf873a9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IDataSetTypeSlaveServerPlugin.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
  * </p>
  *
  * @author Christian Ribeaud
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataSetTypeSlaveServerPlugin
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
index 1edd84e50b3fc7349084219e5ed4d3791753c0a5..a9a445b36138f9376acc39b62eca2e4642815cf9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/plugin/IServerPlugin.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IServerPlugin
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java
index fad9e181d29341e96e7458c902cb09291e1be44e..14bc2efe5140e3f4483e2c2681433c47a8146303 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/GroupIdentifierHelper.java
@@ -40,7 +40,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.GroupCodeHelper;
  * {@link DatabaseInstanceIdentifier} into a {@link DatabaseInstancePE}!
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class GroupIdentifierHelper
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/GenericSharedConstants.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/GenericSharedConstants.java
index dddd0ae7cca2116a9b822ddbdd7b96a2c23f0cfc..db47951d6ba54f5c9f75cc29ad1d1a1b5ba4ebc0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/GenericSharedConstants.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/GenericSharedConstants.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared;
 /**
  * Some public shared constants.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class GenericSharedConstants
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
index c71f02e18478c5bebbf20b53191b8586c48fb226..1cc112751764d489ecccdf25dcc195530d4ded69 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
@@ -103,7 +103,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
 /**
  * Definition of the client-server interface.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICommonServer extends IServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java
index b2a80caba199a94733647d1fafb118fb588ead8d..6791ae5cf5a0fadfb306e6298476a4063cd88c29 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IDataStoreService.java
@@ -27,7 +27,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
 /**
  * Service interface of Data Store Server.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IDataStoreService
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IPluginCommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IPluginCommonServer.java
index fd83e4aabdb4c18761ec36a4a143039bca6b0c17..1f083cbda300e9ce70e2b3e03a4d0936866eb38c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IPluginCommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IPluginCommonServer.java
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
 /**
  * Common interface for all plugin client-server interfaces.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IPluginCommonServer extends IServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/EntityWithGroupKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/EntityWithGroupKind.java
index 3a191eac81c9cb64eef5891b63fc4c3f8bc370d2..5ce2a852b6af13676516482aaa8f4e6231330a06 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/EntityWithGroupKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/EntityWithGroupKind.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE;
  * {@link TechId}.
  * 
  * @author Piotr Buczek
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum EntityWithGroupKind
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
index 0f768d8897d86042b1eb8e94bfc82380c019a591..b27ec9783bbcc9cb367fee67f7fa7e59e31de08a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/IAuthorizationDataProvider.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
 /**
  * Interface of providers of data needed for authorization.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IAuthorizationDataProvider extends IDatabaseInstanceFinder
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java
index 3c0f7a76304bc5d5d9f0a8881af65f067e65bc6e..fa23f207d30348008ea15b46a8cf4699f1797cb7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/ISessionProvider.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSession;
 /**
  * Provider of {@link IAuthSession}.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ISessionProvider
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AbstractGroupPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AbstractGroupPredicate.java
index 68177314d080d20944edb3343c05f67f1bae8766..dbd11575bfdcd512dac2d2c713a14d9b83b7b40a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AbstractGroupPredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/AbstractGroupPredicate.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
 /**
  * Abstract super class of predicates based on groups.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 abstract class AbstractGroupPredicate<T> extends AbstractDatabaseInstancePredicate<T>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DataSetCodePredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DataSetCodePredicate.java
index fe322f4b0c5d02f840c85ffcdc8d91fb8de84720..16c09e47a17f6ef29ecc074b4254725abe6c4474 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DataSetCodePredicate.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/authorization/predicate/DataSetCodePredicate.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ProjectPE;
 /**
  * A {@link IPredicate} based on a list of data set codes.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetCodePredicate extends AbstractGroupPredicate<String>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java
index 52e4106bb4bc7f1cc5a2439af51afc43416afba3..2632283cac5762c446b7b21c49424ea2566e76c0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/BasicConstant.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic;
 /**
  * Definition of basic constants. Can be used by server and GWT client.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class BasicConstant
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeProvider.java
index 233485f03990eded8d1adfb8abd623d7fb0b2522..e7b4c91ed53d1d7e9258a8d48d0b9778086d87e7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/ICodeProvider.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic;
 /**
  * A code provider.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface ICodeProvider
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IInvalidationProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IInvalidationProvider.java
index 9701e18749de328002cfaec112aa38ba9dad7fbf..805587923e0fed644647c1384c3da8d6ba18a853 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IInvalidationProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/IInvalidationProvider.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Invalidation;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IInvalidationProvider
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java
index 75423bc7852c81bd5abcc21b960c859933b19985..848e6c9c701ff9edbc7c971f09870ce67acf0c36 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/URLMethodWithParameters.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class URLMethodWithParameters implements IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
index ff1a84fa743f8a9198fa3d88a1bbffc9af423fa2..6464421e4a031141e174aea4f6a9e8225e1874d1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ColumnSetting.java
@@ -27,7 +27,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
  * <p>
  * Note: This class has to be Java serializable and GWT serializable.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ColumnSetting implements Serializable, IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
index bfea13230d19e3166315b722b73673b46b38e4cf..4f310e0f124dcc9c586f0b6a5432a1ba6d601637 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DatabaseInstance.java
@@ -17,7 +17,7 @@
 package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DatabaseInstance extends Code<DatabaseInstance>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
index 9a068f52859298615f1fb3cb151fd1d499ef8d01..36bb4b0e667134ade999755ade4a00ac07c1a8f7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/DisplaySettings.java
@@ -34,7 +34,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
  * <p>
  * NOTE: Object of this class should be alwayes managed by DisplaySettingsManager on client side.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DisplaySettings implements Serializable, IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java
index 386acf0f594b3ec7102430b2409d1990bcfd6834..e95f15c62e1dadbe8b8fc0988b13ed38eeb2c34a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityKindAndTypeCode.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
 /**
  * Bean combining {@link EntityKind} with entity type code. It determines plug-ins.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class EntityKindAndTypeCode implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Group.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Group.java
index 6f6171ea547f780746a6d9f7bab6a1f16a007a91..979aa84bdc2cda21d09affbb4f7eb6901039ab37 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Group.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Group.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.GroupPE;
 /**
  * The <i>GWT</i> equivalent to {@link GroupPE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class Group extends CodeWithRegistration<Group> implements IIdHolder, IGroupUpdates
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
index ce92e07f1c685b0ca72a51f65583b09df06b203f..2b7c56e44d2a594288b8629c1ecec82d5c4ba3eb 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/Person.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 /**
  * The <i>GWT</i> equivalent to {@link PersonPE}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class Person extends AbstractRegistrationHolder implements Comparable<Person>
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleSetCode.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleSetCode.java
index 7e4b5be8cb70a46b7400be983b3171132070b664..37017099b6b869382ff672e5d423ad88371660f7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleSetCode.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleSetCode.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
 import com.google.gwt.user.client.rpc.IsSerializable;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum RoleSetCode implements IsSerializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
index cd26d40bc77fdc3adb3e93ae0980d16ed8541457..7e064a36b0294fe14d006f1d9846ea8db83e2975 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/VocabularyTermReplacement.java
@@ -23,7 +23,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 /**
  * Wrapper of a {@link VocabularyTerm} and its replacement.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class VocabularyTermReplacement implements IsSerializable, Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
index 96e947a6ca1c4dca4e76b0624533b3de668dcff1..49059769b942634c3cda62af65ee7de0626e1740 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractRegistrationHolder.java
@@ -21,7 +21,7 @@ import java.util.Date;
 /**
  * Super class of DTOs which hold registration data.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public abstract class AbstractRegistrationHolder extends Id
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java
index 0aa3812b9b3e164000d8a8053727996c3c1ded0d..f1e7906523faff36ed1e9fef67b3424cdc77badf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
 /**
  * Context data needed for uploading data sets to a CIFEX server.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataSetUploadContext implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java
index b757bb992fb3251897576ea1f68dceff9cfc1db5..1f3e8c6bcffc37093dd0f86a6dfd9e96fd8a5791 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataStoreServerInfo.java
@@ -35,7 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
  * <li>the unique code of the DSS.
  * </ul>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataStoreServerInfo implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
index dcc70af3a320eeee630c530dde143a0fc0204314..6185c6036a772df262bfe8bce56c08ee83754ffe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePE.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.EqualsHashUtils;
  * Entity is one of: material, sample, experiment
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Izabela Adamczyk
  */
 @MappedSuperclass
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
index 9016e1dff50a7416b52c394dc705e7bacf5b6296..fea775d753a3c65190491f835bb22b486074da32 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java
@@ -41,7 +41,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
  * This represents an entry in <code>{entity}_type_property_types</code> table.
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  * @author Tomasz Pylak
  * @author Izabela Adamczyk
  */
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java
index b06bcaee297cf52afe8660b69d0975e87e25bcbf..089f0dde9346d2332c70a0f9944176c5aa30fab6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
 /**
  * Persistent entity representing an event which changed some entities in the persistent layer.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Entity
 @Table(name = TableNames.EVENTS_TABLE)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java
index 3f562ed8ce65c9b84ded40de683c996d42aab556..0fd8ea17cb4a08d85d3c5d22e767997df885901a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventType.java
@@ -22,7 +22,7 @@ package ch.systemsx.cisd.openbis.generic.shared.dto;
  * These names reflect the ones that could be found in the database.
  * </p>
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum EventType
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java
index 9cc7c6a1cbf20ebb0cc1fc6f54c301f8846f4bab..cd3f0baff27192655b9696918b5bd5db4acd9f68 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IIdAndCodeHolder.java
@@ -23,7 +23,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
  * Read-only interface for beans with a (unique) business code as a string and a unique technical
  * ID.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IIdAndCodeHolder extends IIdHolder
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java
index 43a538c0884ebaf68737fc8d399dd7b0b7dff37c..0f55ac91fb3bb6255f60dc2f85179e59a601354d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IUntypedValueSetter.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.dto;
 /**
  * Holds the untyped property value.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IUntypedValueSetter
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/InvalidationPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/InvalidationPE.java
index c85483073f2596244c56f119501e68ae4c68a2b9..695aabfa35e76396a31907ae2d3c4048601660be 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/InvalidationPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/InvalidationPE.java
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder;
 /**
  * Class representing invalidation.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Entity
 @Table(name = TableNames.INVALIDATION_TABLE)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
index f5b1c3b1e9b0d9a9c2a610ca7afa097cd85ae8e6..43b757538cf708a8b0950d7553d55b33fa97e290 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
@@ -68,7 +68,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 /**
  * A <i>Persistent Entity</i> which is a material.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Entity
 @Table(name = TableNames.MATERIALS_TABLE, uniqueConstraints = @UniqueConstraint(columnNames =
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
index e8a85edee2ded236424bcd0e10ac002e320ff17e..7f1dc0dfc07deb94d959c8fd14dff8e32f0ad127 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProcessingInstruction.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
 /**
  * Processing instruction is a specific experiment attachment.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class NewProcessingInstruction extends AbstractHashable implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
index a1c9c41235888e7e99e1c7dca2a3148ce34d76ff..f7c48f49aa7e52864ce766f60ffea26e1c5aba67 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingInstructionDTO.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.dto;
 /**
  * Processing instruction needed to process raw data.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ProcessingInstructionDTO extends AbstractRegistrationHolder
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
index c7ac5a21e9c69b193bf7bf34277a69769686b3ec..16080d0312f7fab8f47657934178503e86f32c1c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProcessingParameters.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
  * Processing parameters are a binary byte sequence from a file. It is stored BASE64 encoded in
  * order to be marshalling and unmarshalling for SOAP.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ProcessingParameters implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java
index b48f15fc31ef2678ba85e742839b2b23bc285b04..273a4a74650dffd855606322d899b934fbd0a0cf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SimpleSession.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.shared.dto;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class SimpleSession implements IAuthSession
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
index 4c2c2a64c69efa6ca19f5190d8ef4264932abe42..f9bdbe0c1d98a565a559da04c4352dc653e7813b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.openbis.generic.shared.IServer;
  * Note that both dates can be <code>null</code>.
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class TimeInterval implements Serializable
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
index 487988e6c2c0232acf0d0b6e2654f653dd2710b7..a5d4cfafbe631210cfb5106ca06d210c5443de93 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/properties/EntityKind.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePropertyTypePE;
 /**
  * Enumeration of entity kinds.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public enum EntityKind {
 	MATERIAL("material", MaterialPE.class, MaterialTypePE.class,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
index 7e52c5c32cd4b73c635f3c82b25236283ecc3cc7..8d6b6b62602c5ff222797b78a4ab5c7b92708f00 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/DataStoreTranslator.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DataStoreTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java
index 873d627523ce6ea1a74f8e61b9e212ee09dc6c29..777c98bd1b81f31be566690dc01ad2c8be64ebaf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExperimentTypePropertyTypeTranslator.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PropertyTypePE;
 /**
  * A {@link ExperimentTypePropertyType} &lt;---&gt; {@link ExperimentTypePropertyTypePE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class ExperimentTypePropertyTypeTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
index f22a0a9cc747a0c7d64a61d5651a29a89e738a07..0a78a6424eaa54ea921921a559679a95800b2c39 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/ExternalDataTranslator.java
@@ -43,7 +43,7 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.ExperimentTranslator.L
 import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ExternalDataTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
index b993f0b895b2eba381c9dbedfc91319d7c28d57d..f7e9dd930d9c81f69e50b9fc6784628cfd9a8b44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/GroupTranslator.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 /**
  * A {@link Group} &lt;---&gt; {@link GroupPE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class GroupTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
index 3a59a00c7ab6218ce2fd4de0a40a8217c01f9787..a4cdf8a680007d32f3ce7087ca29408843bc03e5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PersonTranslator.java
@@ -28,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 /**
  * A {@link Person} &lt;---&gt; {@link PersonPE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class PersonTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java
index 1003e55aec3cf85a76c3ace897d0d890c04273c1..cc0462c996a4ed15c2d258475fc63676a240d750 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTranslator.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
 /**
  * A {@link Sample} &lt;---&gt; {@link SamplePE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class SampleTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java
index 483daf63a49e10502d1a06adf8ce5be966e09772..51717f720a5ac5b49df3bb732b5f2f4c068ae859 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypePropertyTypeTranslator.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePropertyTypePE;
 /**
  * A {@link SampleTypePropertyType} &lt;---&gt; {@link SampleTypePropertyTypePE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public final class SampleTypePropertyTypeTranslator
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java
index 1187324c687c7a91c9e5f0a800f9d342bb7ae141..47e4aa4f2ea5b767993a1072d0ab52c2ef0b3923 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/SampleTypeTranslator.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
 /**
  * A {@link SampleType} &lt;---&gt; {@link SampleTypePE} translator.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class SampleTypeTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java
index eb70a71c8c093df8bd7772ac4a801bb36144e657..fd578bc2bd7c0ba8968a3188afa7a67b58a62b1a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/TypeTranslator.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.SampleTypePE;
 /**
  * Translator of {@link AbstractTypePE} instances.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class TypeTranslator
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java
index ec4c21bce1861722e51d82db0c796fca59aa7968..9774f51e86d9ea0f007068b9abedeea29f3af297 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/DatabaseInstanceIdentifierHelper.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceId
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class DatabaseInstanceIdentifierHelper
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/GroupCodeHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/GroupCodeHelper.java
index b1dc4b6b0b6f98ef585599c18754d92e24ee45db..5a7707652098603a26fe0c06e45a8049ca1ccd1e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/GroupCodeHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/GroupCodeHelper.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.exception.UndefinedGroupExcep
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.GroupIdentifier;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class GroupCodeHelper
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
index 025a4ec296db15bd00c0de0193b8dfcfe44ccb20..d58ee774e415e737b10e6853ff9508400fb3719e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientService.java
@@ -47,7 +47,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
  * unexpected exception.
  * </p>
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IGenericClientService extends IClientService
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
index 0abd581a0a9c476f52006f75f320078afc3029a4..0b4db0b32c88c95eae3fb410daf7de0a14c2c6f3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/IGenericClientServiceAsync.java
@@ -44,7 +44,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 /**
  * Asynchronous version of {@link IGenericClientService}.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IGenericClientServiceAsync extends IClientServiceAsync
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java
index a905e38796f224223e692cc90200ec21a9f7218f..bf0257d046f259711437f86171dcb45c7537ef8d 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetBrowser.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public class ExperimentDataSetBrowser extends AbstractExternalDataGrid
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetSection.java
index 37c44808c6857120412a2052705080925af10045..f229a68ad52ce061171b12cd6434530e16a1ba86 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentDataSetSection.java
@@ -22,7 +22,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 class ExperimentDataSetSection extends BrowserSectionPanel
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
index 1d01c5f31e8d44741d56b125173c806e82e08dd9..b6ace5141a2a84fdcd36bcb61ce037a32980c5c8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetBrowser.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType;
 import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample.GenericSampleViewer.DataSetConnectionTypeProvider;
 
 /**
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 class SampleDataSetBrowser extends AbstractExternalDataGrid
 {
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 9915117c49a87baa45fd7c17e4068a0e201f8088..934cc75c55ce66d66549e2adbe4ee14c97d6bf0d 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
@@ -85,7 +85,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 /**
  * The {@link IGenericClientService} implementation.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Component(value = ResourceNames.GENERIC_PLUGIN_SERVICE)
 public final class GenericClientService extends AbstractClientService implements
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
index a0d9bcd39febaf5d6973fbf787f4585e68705bb2..87f005d066f644dffc42b8c449e93b8d88f39ea1 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/AbstractGenericServerPlugin.java
@@ -24,7 +24,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
 /**
  * 
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 abstract class AbstractGenericServerPlugin implements IServerPlugin
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
index 93aca87ca1743916e75782da6fc29d75ac1adf88..d8fe918475071aaa26ae81f37037b9b30a8886d8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetServerPlugin.java
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.server.plugin.IDataSetTypeSlaveServerPlu
 /**
  * The default {@link IDataSetServerPlugin} implementation for the <i>generic</i> technology.
  *
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_SERVER_PLUGIN)
 public class GenericDataSetServerPlugin extends AbstractGenericServerPlugin implements
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
index 78ae77fc13f96ce44abfd61b635af602fbaa0241..f2c204085533d0217290748fba2a09b0dcca740c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericDataSetTypeSlaveServerPlugin.java
@@ -31,7 +31,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 /**
  * The <i>generic</i> data set slave server.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Component(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.GENERIC_DATA_SET_TYPE_SLAVE_SERVER_PLUGIN)
 public class GenericDataSetTypeSlaveServerPlugin implements IDataSetTypeSlaveServerPlugin
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
index 8b0c899ec0f2b07c2114877c0aa85ef77abff61d..0ace150d1f7727120ad4de3614715ed917149da3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServer.java
@@ -81,7 +81,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.ResourceNames;
 /**
  * Implementation of client-server interface.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 @Component(ResourceNames.GENERIC_PLUGIN_SERVER)
 public final class GenericServer extends AbstractServer<IGenericServer> implements
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java
index c54422475699039905c9268e5181a3a4111d2fb8..897cbe7b176629112dcfb4e9eaaa709b63e07e5f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/GenericServerLogger.java
@@ -52,7 +52,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
 /**
  * Logger class for {@link GenericServer} which creates readable logs of method invocations.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 final class GenericServerLogger extends AbstractServerLogger implements IGenericServer
 {
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
index c8b51eeba1cae9e2fdd8ea4e9b9d45c656e70d30..245761a8703d56d1f1888f80d7c9acc695c647a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/shared/IGenericServer.java
@@ -60,7 +60,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifi
 /**
  * Definition of the client-server interface.
  * 
- * @author   Franz-Josef Elmer
+ * @author    Franz-Josef Elmer
  */
 public interface IGenericServer extends IPluginCommonServer
 {