[LMS-449] Use home group instead of group in service.properties

with broken smoketests

SVN: 6887

common/source/java/ch/systemsx/cisd/common/exceptions/HomeGroupUndefinedException.java

+/*
+ * Copyright 2007 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.common.exceptions;
+
+/**
+ * This <code>UserFailureException</code> extension signals that a session has expired.
+ * 
+ * @author Christian Ribeaud
+ */
+public final class HomeGroupUndefinedException extends UserFailureException
+{
+    private static final long serialVersionUID = 1L;
+
+    public HomeGroupUndefinedException(final String message)
+    {
+        super(message);
+    }
+
+    public HomeGroupUndefinedException()
+    {
+        super("Home group undefined.");
+    }
+
+}

dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java

@@ -88,8 +88,6 @@ public class DatabaseConfigurationContext implements DisposableBean
 
     private String urlHostPart;
 
-    private String groupCode;
-
     private String databaseInstance;
 
     public DatabaseConfigurationContext()
@@ -103,16 +101,6 @@ public class DatabaseConfigurationContext implements DisposableBean
         this.dataSourceFactory = dataSourceFactory;
     }
 
-    public final String getGroupCode()
-    {
-        return StringUtils.trim(groupCode);
-    }
-
-    public final void setGroupCode(final String groupCode)
-    {
-        this.groupCode = groupCode;
-    }
-
     private final static void closeConnection(final DataSource dataSource)
     {
         if (dataSource != null)
@@ -121,7 +109,7 @@ public class DatabaseConfigurationContext implements DisposableBean
             {
                 if (dataSource instanceof BasicDataSource)
                 {
-                    (((BasicDataSource) dataSource)).close();
+                    ((BasicDataSource) dataSource).close();
                 }
                 if (dataSource instanceof DisposableBean)
                 {

integration-tests/templates/openBIS-server/service.properties

@@ -36,9 +36,6 @@ processing-instruction.IMAGE_ANALYSIS.prefix-for-relative-paths =
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 30
 
-# Group identifier (mandatory).
-group-code = CISD
-
 # The database instance unique identifier.
 # Replaces the one found in the database if SYSTEM_DEFAULT.
 database-instance = CISD