svn commit: r1399422 - /incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java

[rm...@apache.org]

Author: rmatthews
Date: Wed Oct 17 20:42:27 2012
New Revision: 1399422

URL: http://svn.apache.org/viewvc?rev=1399422&view=rev
Log:
ISIS-240 - removed the implicit adding of the new bookmarking service.  To be used this now needs to be explicitly specified in the properties files like any other service does.

Modified:
    incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java

Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java?rev=1399422&r1=1399421&r2=1399422&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServicesInstallerFromConfiguration.java Wed Oct 17 20:42:27 2012
@@ -19,24 +19,19 @@
 
 package org.apache.isis.runtimes.dflt.runtime.services;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.log4j.Logger;
-
 import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.commons.config.InstallerAbstract;
 import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.factory.InstanceCreationClassException;
 import org.apache.isis.core.commons.factory.InstanceCreationException;
-import org.apache.isis.core.commons.lang.ArrayUtils;
-import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.metamodel.services.bookmarks.BookmarkServiceDefault;
 import org.apache.isis.runtimes.dflt.runtime.fixturedomainservice.ObjectFixtureService;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
+import org.apache.log4j.Logger;
 
 import com.google.common.collect.Lists;
 
@@ -66,8 +61,6 @@ public class ServicesInstallerFromConfig
         if (serviceList.size() == 0) {
             throw new InitialisationException("No services specified");
         }
-        appendBookmarkService(serviceList);
-        
         return Collections.unmodifiableList(serviceList);
     }
 
@@ -118,11 +111,6 @@ public class ServicesInstallerFromConfig
         }
     }
 
-    private void appendBookmarkService(List<Object> serviceList) {
-        serviceList.add(new BookmarkServiceDefault());
-    }
-
-
     /**
      * In the format <tt>xxx#aaa.bbb.ccc.DddEee</tt> where <tt>xxx</tt> is the
      * name of the repository, and <tt>aaa.bbb.ccc.DddEee</tt> is the fully