incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1056832 [11/17] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/alternatives/bytecode/javassist/classsubstitutor/ alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/ alternat...
Date Sat, 08 Jan 2011 22:54:01 GMT
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticator.java Sat Jan  8 22:53:36 2011
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationAuthenticatorConstants.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.authentication.standard.exploration;
 
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 
 public final class ExplorationAuthenticatorConstants {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/ExplorationSession.java Sat Jan  8 22:53:36 2011
@@ -22,11 +22,11 @@ package org.apache.isis.core.runtime.aut
 
 import java.io.IOException;
 
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 
 
 public final class ExplorationSession extends AuthenticationSessionAbstract implements Encodable {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/MultiUserExplorationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/MultiUserExplorationSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/MultiUserExplorationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/exploration/MultiUserExplorationSession.java Sat Jan  8 22:53:36 2011
@@ -26,11 +26,11 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
 import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/fixture/LogonFixtureAuthenticator.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.authentication.standard.fixture;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.core.runtime.authentication.standard.AuthenticatorAbstract;
 import org.apache.isis.core.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/singleuser/SingleUserSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/singleuser/SingleUserSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/singleuser/SingleUserSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authentication/standard/singleuser/SingleUserSession.java Sat Jan  8 22:53:36 2011
@@ -22,10 +22,10 @@ package org.apache.isis.core.runtime.aut
 
 import java.io.IOException;
 
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 
 public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManager.java Sat Jan  8 22:53:36 2011
@@ -21,9 +21,9 @@
 package org.apache.isis.core.runtime.authorization;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/AuthorizationManagerAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.authorization;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 
 
 public abstract class AuthorizationManagerAbstract implements AuthorizationManager {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationConstants.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.authorization.standard;
 
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 
 public final class AuthorizationConstants {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandard.java Sat Jan  8 22:53:36 2011
@@ -21,9 +21,9 @@
 package org.apache.isis.core.runtime.authorization.standard;
 
 import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authorization.AuthorizationManagerAbstract;
 
 public class AuthorizationManagerStandard extends AuthorizationManagerAbstract {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizationManagerStandardInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -22,8 +22,8 @@ package org.apache.isis.core.runtime.aut
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/authorization/standard/AuthorizorAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.authorization.standard;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 
 
 public abstract class AuthorizorAbstract implements Authorizor {

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/DebugList.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/DebugList.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/DebugList.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugList.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/DebugList.java Sat Jan  8 22:53:36 2011
@@ -18,22 +18,28 @@
  */
 
 
-package org.apache.isis.core.commons.debug;
+package org.apache.isis.core.runtime.context;
 
-import java.util.ArrayList;
 import java.util.List;
 
+import com.google.common.collect.Lists;
+
+import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+
 
 public class DebugList {
-    private final List<DebugInfo> l = new ArrayList<DebugInfo>();
+    private final List<DebuggableWithTitle> l = Lists.newArrayList();
     private final DebugString summary = new DebugString();
 
     public DebugList(final String name) {
-        l.add(new DebugInfo() {
+        l.add(new DebuggableWithTitle() {
+            @Override
             public void debugData(DebugString debug) {
                 debug.append(summary.toString());
             }
 
+            @Override
             public String debugTitle() {
                 return name;
             }
@@ -41,18 +47,17 @@ public class DebugList {
     }
 
     public void add(String name, Object object) {
-        boolean b = object instanceof DebugInfo;
+        boolean b = object instanceof DebuggableWithTitle;
         if (b) {
-            l.add((DebugInfo) object);
+            l.add((DebuggableWithTitle) object);
         }
         if (object != null) {
             summary.appendln(name + (b ? "*" : ""), object.toString());
         }
     }
 
-    public DebugInfo[] debug() {
-        return l.toArray(new DebugInfo[l.size()]);
+    public DebuggableWithTitle[] debug() {
+        return l.toArray(new DebuggableWithTitle[l.size()]);
     }
-
 }
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java Sat Jan  8 22:53:36 2011
@@ -21,14 +21,13 @@ package org.apache.isis.core.runtime.con
 
 import java.util.List;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.TransactionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
-import org.apache.isis.core.commons.debug.DebugList;
+import org.apache.isis.core.commons.config.IsisConfigurationException;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.ConfigurationException;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authorization.AuthorizationManager;
@@ -53,7 +52,7 @@ import org.apache.log4j.Logger;
  * <p>
  * Somewhat analogous to (the static methods in) <tt>HibernateUtil</tt>.
  */
-public abstract class IsisContext implements DebugInfo {
+public abstract class IsisContext implements DebuggableWithTitle {
 
     private static final Logger LOG = Logger.getLogger(IsisContext.class);
 
@@ -307,7 +306,7 @@ public abstract class IsisContext implem
      */
     public static IsisConfiguration getConfiguration() {
         if (configuration == null) {
-            throw new ConfigurationException("No configuration available");
+            throw new IsisConfigurationException("No configuration available");
         }
         // REVIEW
         return configuration;
@@ -478,7 +477,7 @@ public abstract class IsisContext implem
     // Debug
     // ///////////////////////////////////////////////////////////
 
-    public static DebugInfo[] debugSystem() {
+    public static DebuggableWithTitle[] debugSystem() {
         DebugList debugList = new DebugList("Apache Isis System");
         debugList.add("Context", getInstance());
         debugList.add("Apache Isis session factory", getSessionFactory());
@@ -496,7 +495,7 @@ public abstract class IsisContext implem
         return debugList.debug();
     }
 
-    public static DebugInfo[] debugSession() {
+    public static DebuggableWithTitle[] debugSession() {
         DebugList debugList = new DebugList("Apache Isis Session");
         debugList.add("Apache Isis session", getSession());
         debugList.add("Authentication session", getAuthenticationSession());

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextPipe.java Sat Jan  8 22:53:36 2011
@@ -19,8 +19,8 @@
 
 package org.apache.isis.core.runtime.context;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.session.IsisSession;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextStatic.java Sat Jan  8 22:53:36 2011
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.runtime.context;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.applib.maybe.Maybe;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.core.commons.lang.Maybe;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.session.IsisSession;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
 import org.apache.isis.core.runtime.system.DeploymentType;
@@ -131,8 +131,8 @@ public class IsisContextStatic extends I
     }
 
     private void debug(final DebugString debug, final Object object) {
-        if (object instanceof DebugInfo) {
-            final DebugInfo d = (DebugInfo) object;
+        if (object instanceof DebuggableWithTitle) {
+            final DebuggableWithTitle d = (DebuggableWithTitle) object;
             debug.appendTitle(d.debugTitle());
             d.debugData(debug);
         } else {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContextThreadLocal.java Sat Jan  8 22:53:36 2011
@@ -22,8 +22,8 @@ package org.apache.isis.core.runtime.con
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.session.IsisSession;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
 import org.apache.log4j.Logger;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixture/ObjectFixtureService.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixture/ObjectFixtureService.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixture/ObjectFixtureService.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixture/ObjectFixtureService.java Sat Jan  8 22:53:36 2011
@@ -38,9 +38,9 @@ import org.apache.isis.applib.annotation
 import org.apache.isis.applib.annotation.Exploration;
 import org.apache.isis.applib.annotation.Hidden;
 import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.Persistability;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/FixturesInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 
 public abstract class FixturesInstallerAbstract extends InstallerAbstract implements FixturesInstaller {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/SwitchUserServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/SwitchUserServiceImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/SwitchUserServiceImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/SwitchUserServiceImpl.java Sat Jan  8 22:53:36 2011
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.applib.fixtures.switchuser.SwitchUserService;
 import org.apache.isis.applib.fixtures.switchuser.SwitchUserServiceAware;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/config/FixturesFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/config/FixturesFromConfiguration.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/config/FixturesFromConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturesinstaller/config/FixturesFromConfiguration.java Sat Jan  8 22:53:36 2011
@@ -21,9 +21,10 @@
 package org.apache.isis.core.runtime.fixturesinstaller.config;
 
 import org.apache.log4j.Logger;
+
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.runtime.fixture.ObjectLoaderFixture;
 import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerAbstract;
 import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerDelegate;
@@ -53,7 +54,7 @@ public class FixturesFromConfiguration e
             for (int i = 0; i < fixtureList.length; i++) {
                 String fixtureFullyQualifiedName = fixturePrefix + fixtureList[i];
                 LOG.info("  adding fixture " + fixtureFullyQualifiedName);
-				final Object fixture = InstanceFactory.createInstance(fixtureFullyQualifiedName);
+				final Object fixture = InstanceUtil.createInstance(fixtureFullyQualifiedName);
 				fixtureLoaded = true;
 				delegate.addFixture(fixture);
             }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageLoaderNoopInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageLoaderNoopInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageLoaderNoopInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageLoaderNoopInstaller.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.ima
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 
 public class TemplateImageLoaderNoopInstaller extends InstallerAbstract implements TemplateImageLoaderInstaller {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/ImageConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/ImageConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/ImageConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/ImageConstants.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.imageloader.awt;
 
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 
 
 public class ImageConstants {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java Sat Jan  8 22:53:36 2011
@@ -36,8 +36,8 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Vector;
 
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.lang.Resources;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.imageloader.TemplateImage;
 import org.apache.isis.core.runtime.imageloader.TemplateImageImpl;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwtInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwtInstaller.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwtInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwtInstaller.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.ima
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookup.java Sat Jan  8 22:53:36 2011
@@ -23,9 +23,9 @@ package org.apache.isis.core.runtime.ins
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderAware;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
@@ -50,7 +50,7 @@ import org.apache.isis.core.runtime.web.
  * The methods of {@link InstallerRepository} may be called without {@link #init() initializing} this class,
  * but other methods may not.
  */
-public interface InstallerLookup extends InstallerRepository, ApplicationScopedComponent, ConfigurationBuilderAware, Injectable {
+public interface InstallerLookup extends InstallerRepository, ApplicationScopedComponent, IsisConfigurationBuilderAware, Injectable {
 
     // /////////////////////////////////////////////////////////
     // metamodel
@@ -133,7 +133,7 @@ public interface InstallerLookup extends
     /**
      * Injected.
      */
-    ConfigurationBuilder getConfigurationBuilder();
+    IsisConfigurationBuilder getConfigurationBuilder();
 
 }
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java Sat Jan  8 22:53:36 2011
@@ -32,18 +32,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.isis.core.commons.components.Installer;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.NotFoundPolicy;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.ensure.Ensure;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.factory.InstanceCreationClassException;
 import org.apache.isis.core.commons.factory.InstanceCreationException;
-import org.apache.isis.core.commons.factory.InstanceFactory;
+import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.commons.factory.UnavailableClassException;
 import org.apache.isis.core.commons.lang.CastUtils;
 import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
-import org.apache.isis.core.metamodel.config.NotFoundPolicy;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.runtime.about.AboutIsis;
@@ -94,9 +94,9 @@ public class InstallerLookupDefault impl
      * 
      * <p>
      * 
-     * @see #setConfigurationBuilder(ConfigurationBuilder)
+     * @see #setConfigurationBuilder(IsisConfigurationBuilder)
      */
-    private ConfigurationBuilder configurationBuilder;
+    private IsisConfigurationBuilder isisConfigurationBuilder;
 
     // ////////////////////////////////////////////////////////
     // Constructor
@@ -118,7 +118,7 @@ public class InstallerLookupDefault impl
                     continue;
                 }
                 try {
-                    final Installer object = (Installer) InstanceFactory.createInstance(className);
+                    final Installer object = (Installer) InstanceUtil.createInstance(className);
                     LOG.debug("created component installer: " + object.getName() + " - " + className);
                     installerList.add(object);
                 } catch (final UnavailableClassException e) {
@@ -168,7 +168,7 @@ public class InstallerLookupDefault impl
     }
 
     private void ensureDependenciesInjected() {
-        Ensure.ensureThatState(configurationBuilder, is(not(nullValue())));
+        Ensure.ensureThatState(isisConfigurationBuilder, is(not(nullValue())));
     }
 
     public void shutdown() {
@@ -293,7 +293,7 @@ public class InstallerLookupDefault impl
     @SuppressWarnings("unchecked")
     public Installer getInstaller(final String implClassName) {
         try {
-            Installer installer = CastUtils.cast(InstanceFactory.createInstance(implClassName));
+            Installer installer = CastUtils.cast(InstanceUtil.createInstance(implClassName));
             if (installer != null) {
                 mergeConfigurationFor(installer);
                 injectDependenciesInto(installer);
@@ -309,7 +309,7 @@ public class InstallerLookupDefault impl
     @SuppressWarnings("unchecked")
     public <T extends Installer> T getInstaller(final Class<T> installerCls) {
         try {
-            T installer = (T) (InstanceFactory.createInstance(installerCls));
+            T installer = (T) (InstanceUtil.createInstance(installerCls));
             if (installer != null) {
                 mergeConfigurationFor(installer);
                 injectDependenciesInto(installer);
@@ -364,12 +364,12 @@ public class InstallerLookupDefault impl
     // ////////////////////////////////////////////////////////
 
     public IsisConfiguration getConfiguration() {
-        return configurationBuilder.getConfiguration();
+        return isisConfigurationBuilder.getConfiguration();
     }
 
     public void mergeConfigurationFor(Installer installer) {
         for (String installerConfigResource : installer.getConfigurationResources()) {
-            configurationBuilder.addConfigurationResource(installerConfigResource, NotFoundPolicy.CONTINUE);
+            isisConfigurationBuilder.addConfigurationResource(installerConfigResource, NotFoundPolicy.CONTINUE);
         }
     }
 
@@ -387,20 +387,20 @@ public class InstallerLookupDefault impl
             InstallerLookupAware cast = InstallerLookupAware.class.cast(candidate);
             cast.setInstallerLookup(this);
         }
-        configurationBuilder.injectInto(candidate);
+        isisConfigurationBuilder.injectInto(candidate);
     }
 
     // ////////////////////////////////////////////////////////
     // Dependencies (injected)
     // ////////////////////////////////////////////////////////
 
-    public ConfigurationBuilder getConfigurationBuilder() {
-        return configurationBuilder;
+    public IsisConfigurationBuilder getConfigurationBuilder() {
+        return isisConfigurationBuilder;
     }
 
     @Inject
-    public void setConfigurationBuilder(final ConfigurationBuilder configurationLoader) {
-        this.configurationBuilder = configurationLoader;
+    public void setConfigurationBuilder(final IsisConfigurationBuilder configurationLoader) {
+        this.isisConfigurationBuilder = configurationLoader;
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java Sat Jan  8 22:53:36 2011
@@ -33,7 +33,8 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.PropertyConfigurator;
-import org.apache.isis.core.commons.io.IoUtils;
+
+import org.apache.isis.core.commons.lang.IoUtils;
 import org.apache.isis.core.runtime.runner.Constants;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/logging/Logger.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.log
 
 import org.apache.log4j.Level;
 
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 
 public abstract class Logger {
     public static final String PROPERTY_ROOT = ConfigurationConstants.ROOT + "logging.";

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/CollectionData.java Sat Jan  8 22:53:36 2011
@@ -23,11 +23,11 @@ package org.apache.isis.core.runtime.mem
 import java.io.IOException;
 
 import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 
 
 class CollectionData extends Data {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Data.java Sat Jan  8 22:53:36 2011
@@ -24,12 +24,12 @@ import java.io.IOException;
 import java.io.Serializable;
 
 import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
 
 class Data implements Encodable, Serializable {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java Sat Jan  8 22:53:36 2011
@@ -29,13 +29,13 @@ import org.apache.log4j.Logger;
 import com.google.common.collect.Lists;
 
 import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.encoding.DataInputStreamExtended;
+import org.apache.isis.core.commons.encoding.DataOutputStreamExtended;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Null.java Sat Jan  8 22:53:36 2011
@@ -22,9 +22,9 @@ package org.apache.isis.core.runtime.mem
 
 import java.io.Serializable;
 
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 
 
 class Null implements Encodable, Serializable {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/ObjectData.java Sat Jan  8 22:53:36 2011
@@ -25,10 +25,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
+import org.apache.isis.core.commons.encoding.Encodable;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.core.metamodel.encoding.Encodable;
 
 
 class ObjectData extends Data {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/StandaloneData.java Sat Jan  8 22:53:36 2011
@@ -25,9 +25,9 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerAdditionalProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerAdditionalProperty.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerAdditionalProperty.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerAdditionalProperty.java Sat Jan  8 22:53:36 2011
@@ -28,7 +28,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -51,12 +52,12 @@ public class OptionHandlerAdditionalProp
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		addConfigurationProperties(configurationBuilder, additionalProperties);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		addConfigurationProperties(isisConfigurationBuilder, additionalProperties);
 	}
 
     private void addConfigurationProperties(
-    		final ConfigurationBuilder configurationBuilder, 
+    		final IsisConfigurationBuilder isisConfigurationBuilder, 
     		final List<String> additionalProperties) {
         if (additionalProperties == null) {
         	return;
@@ -67,7 +68,7 @@ public class OptionHandlerAdditionalProp
 				key = additionalProperty;
 			} else {
 				value = additionalProperty;
-				configurationBuilder.add(key, value);
+				isisConfigurationBuilder.add(key, value);
 				key = null;
 			}
 		}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConfiguration.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConfiguration.java Sat Jan  8 22:53:36 2011
@@ -24,8 +24,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.NotFoundPolicy;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.NotFoundPolicy;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -50,11 +51,11 @@ public class OptionHandlerConfiguration 
         return true;
     }
 
-    public void primeConfigurationBuilder(ConfigurationBuilder configurationBuilder) {
+    public void primeConfigurationBuilder(IsisConfigurationBuilder isisConfigurationBuilder) {
         if (configurationResource == null) {
             return;
         }
-        configurationBuilder.addConfigurationResource(configurationResource, NotFoundPolicy.FAIL_FAST);
+        isisConfigurationBuilder.addConfigurationResource(configurationResource, NotFoundPolicy.FAIL_FAST);
     }
 
 }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerConnector.java Sat Jan  8 22:53:36 2011
@@ -29,8 +29,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
@@ -63,8 +64,8 @@ public class OptionHandlerConnector exte
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.CLIENT_CONNECTION_KEY, ListUtils.listToString(connectorNames));
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.CLIENT_CONNECTION_KEY, ListUtils.listToString(connectorNames));
 	}
 	
 	public List<String> getConnectorNames() {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDebug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDebug.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDebug.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDebug.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,8 @@ package org.apache.isis.core.runtime.opt
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
 
@@ -43,7 +44,7 @@ public class OptionHandlerDebug extends 
         return true;
     }
 
-    public void primeConfigurationBuilder(ConfigurationBuilder configurationBuilder) {
+    public void primeConfigurationBuilder(IsisConfigurationBuilder isisConfigurationBuilder) {
         // TODO need to prime or otherwise set logging.
     }
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDeploymentType.java Sat Jan  8 22:53:36 2011
@@ -24,8 +24,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.NotFoundPolicy;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.NotFoundPolicy;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -85,12 +86,12 @@ public abstract class OptionHandlerDeplo
     }
 
     public void primeConfigurationBuilder(
-            ConfigurationBuilder configurationBuilder) {
+            IsisConfigurationBuilder isisConfigurationBuilder) {
         String type = deploymentType.nameLowerCase();
-        configurationBuilder.addConfigurationResource(type + ".properties",
+        isisConfigurationBuilder.addConfigurationResource(type + ".properties",
                 NotFoundPolicy.CONTINUE);
 
-        configurationBuilder.add(SystemConstants.DEPLOYMENT_TYPE_KEY,
+        isisConfigurationBuilder.add(SystemConstants.DEPLOYMENT_TYPE_KEY,
                 deploymentType.name());
     }
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerDiagnostics.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -49,7 +50,7 @@ public class OptionHandlerDiagnostics ex
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
+			IsisConfigurationBuilder isisConfigurationBuilder) {
 		// TODO need to do what, exactly?
 	}
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerFixture.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -54,8 +55,8 @@ public class OptionHandlerFixture extend
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.FIXTURE_KEY, fixture);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.FIXTURE_KEY, fixture);
 	}
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerHelp.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerHelp.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerHelp.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerHelp.java Sat Jan  8 22:53:36 2011
@@ -25,7 +25,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -50,7 +51,7 @@ public class OptionHandlerHelp extends O
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
+			IsisConfigurationBuilder isisConfigurationBuilder) {
 		// nothing to do
 		
 	}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerNoSplash.java Sat Jan  8 22:53:36 2011
@@ -25,7 +25,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.core.runtime.system.SystemConstants;
@@ -48,9 +49,9 @@ public class OptionHandlerNoSplash exten
         return true;
     }
 
-    public void primeConfigurationBuilder(ConfigurationBuilder configurationBuilder) {
+    public void primeConfigurationBuilder(IsisConfigurationBuilder isisConfigurationBuilder) {
         if (noSplash) {
-            configurationBuilder.add(SystemConstants.NOSPLASH_KEY, "true");
+            isisConfigurationBuilder.add(SystemConstants.NOSPLASH_KEY, "true");
         }
  //       configurationBuilder.add(SystemConstants.NOSPLASH_KEY, noSplash ? "true" : "false");
     }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPassword.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -54,8 +55,8 @@ public class OptionHandlerPassword exten
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.PASSWORD_KEY, password);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.PASSWORD_KEY, password);
 	}
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerPersistor.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
 import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstaller;
 import org.apache.isis.core.runtime.runner.BootPrinter;
@@ -59,8 +60,8 @@ public class OptionHandlerPersistor exte
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.OBJECT_PERSISTOR_INSTALLER_KEY, persistorName);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.OBJECT_PERSISTOR_INSTALLER_KEY, persistorName);
 	}
 
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerQuiet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerQuiet.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerQuiet.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerQuiet.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
 
@@ -43,7 +44,7 @@ public class OptionHandlerQuiet extends 
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
+			IsisConfigurationBuilder isisConfigurationBuilder) {
 		// TODO need to do what, exactly???
 	}
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerReflector.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
 import org.apache.isis.core.runtime.runner.BootPrinter;
@@ -59,8 +60,8 @@ public class OptionHandlerReflector exte
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.REFLECTOR_KEY, reflector);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.REFLECTOR_KEY, reflector);
 	}
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUser.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -55,8 +56,8 @@ public class OptionHandlerUser extends O
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.USER_KEY, userName);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.USER_KEY, userName);
 	}
 
 	public String getUserName() {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerUserProfileStore.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
@@ -58,8 +59,8 @@ public class OptionHandlerUserProfileSto
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.PROFILE_PERSISTOR_INSTALLER_KEY, userProfileStoreName);
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.PROFILE_PERSISTOR_INSTALLER_KEY, userProfileStoreName);
 	}
 
 	public String getUserProfileStoreName() {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVerbose.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.core.runtime.system.SystemConstants;
@@ -44,7 +45,7 @@ public class OptionHandlerVerbose extend
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
+			IsisConfigurationBuilder isisConfigurationBuilder) {
 		// TODO need to do what, exactly???
 		
 	}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerVersion.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,8 @@ import static org.apache.isis.core.runti
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
 import org.apache.isis.core.runtime.runner.options.OptionHandlerAbstract;
@@ -49,7 +50,7 @@ public class OptionHandlerVersion extend
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
+			IsisConfigurationBuilder isisConfigurationBuilder) {
 		// nothing to do
 		
 	}

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/options/standard/OptionHandlerViewer.java Sat Jan  8 22:53:36 2011
@@ -29,8 +29,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.core.runtime.installers.InstallerRepository;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 import org.apache.isis.core.runtime.runner.Constants;
@@ -62,8 +63,8 @@ public class OptionHandlerViewer extends
 	}
 	
 	public void primeConfigurationBuilder(
-			ConfigurationBuilder configurationBuilder) {
-		configurationBuilder.add(SystemConstants.VIEWER_KEY, ListUtils.listToString(viewerNames));
+			IsisConfigurationBuilder isisConfigurationBuilder) {
+		isisConfigurationBuilder.add(SystemConstants.VIEWER_KEY, ListUtils.listToString(viewerNames));
 	}
 
 	public List<String> getViewerNames() {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceConstants.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 package org.apache.isis.core.runtime.persistence;
 
 import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.services.ServicesInjectorDefault;
 import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceMechanismInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -24,16 +24,15 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
 
-import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.log4j.Logger;
 
 import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.commons.factory.InstanceUtil;
 import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.runtime.installers.InstallerLookup;
@@ -165,7 +164,7 @@ public abstract class PersistenceMechani
         final String configuredClassName =
             configuration.getString(PersistenceConstants.ADAPTER_FACTORY_CLASS_NAME,
                 PersistenceConstants.ADAPTER_FACTORY_CLASS_NAME_DEFAULT);
-        return InstanceFactory.createInstance(configuredClassName, AdapterFactory.class);
+        return InstanceUtil.createInstance(configuredClassName, AdapterFactory.class);
     }
 
     /**
@@ -180,7 +179,7 @@ public abstract class PersistenceMechani
         final String configuredClassName =
             configuration.getString(PersistenceConstants.OBJECT_FACTORY_CLASS_NAME,
                 PersistenceConstants.OBJECT_FACTORY_CLASS_NAME_DEFAULT);
-        return InstanceFactory.createInstance(configuredClassName,
+        return InstanceUtil.createInstance(configuredClassName,
             PersistenceConstants.OBJECT_FACTORY_CLASS_NAME_DEFAULT, ObjectFactory.class);
     }
 
@@ -196,7 +195,7 @@ public abstract class PersistenceMechani
         final String configuredClassName =
             configuration.getString(PersistenceConstants.SERVICES_INJECTOR_CLASS_NAME,
                 PersistenceConstants.SERVICES_INJECTOR_CLASS_NAME_DEFAULT);
-        return InstanceFactory.createInstance(configuredClassName, ServicesInjector.class);
+        return InstanceUtil.createInstance(configuredClassName, ServicesInjector.class);
     }
 
     /**
@@ -211,7 +210,7 @@ public abstract class PersistenceMechani
         final String oidGeneratorClassName =
             configuration.getString(PersistenceConstants.OID_GENERATOR_CLASS_NAME,
                 PersistenceConstants.OID_GENERATOR_CLASS_NAME_DEFAULT);
-        return InstanceFactory.createInstance(oidGeneratorClassName, OidGenerator.class);
+        return InstanceUtil.createInstance(oidGeneratorClassName, OidGenerator.class);
     }
 
     /**
@@ -233,9 +232,7 @@ public abstract class PersistenceMechani
     protected RuntimeContext createRuntimeContext(final IsisConfiguration configuration) {
         Properties properties = new Properties();
         IsisConfiguration applicationConfiguration = configuration.getProperties("application");
-        Enumeration<String> names = applicationConfiguration.propertyNames();
-        while (names.hasMoreElements()) {
-            String key = names.nextElement();
+        for (String key : applicationConfiguration) {
             String value = applicationConfiguration.getString(key);
             String newKey = key.substring("application.".length());
             properties.setProperty(newKey, value);
@@ -257,7 +254,7 @@ public abstract class PersistenceMechani
         final String configuredClassName =
             configuration.getString(PersistenceConstants.DOMAIN_OBJECT_CONTAINER_CLASS_NAME,
                 PersistenceConstants.DOMAIN_OBJECT_CONTAINER_NAME_DEFAULT);
-        return InstanceFactory.createInstance(configuredClassName,
+        return InstanceUtil.createInstance(configuredClassName,
             PersistenceConstants.DOMAIN_OBJECT_CONTAINER_NAME_DEFAULT, DomainObjectContainer.class);
     }
 



Mime
View raw message