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 [12/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/persistence/PersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSession.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.per
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware;
@@ -46,7 +46,7 @@ public interface PersistenceSession exte
         IsisTransactionManagerAware,
         SessionScopedComponent,
         Injectable,
-        DebugInfo {
+        DebuggableWithTitle {
 
     
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistenceSessionLogger.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.per
 import java.util.List;
 
 import org.apache.isis.applib.query.Query;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
@@ -41,7 +41,7 @@ import org.apache.isis.core.runtime.pers
 import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
 
 
-public class PersistenceSessionLogger extends Logger implements PersistenceSession, DebugInfo {
+public class PersistenceSessionLogger extends Logger implements PersistenceSession, DebuggableWithTitle {
     
     private final PersistenceSession underlying;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java Sat Jan  8 22:53:36 2011
@@ -29,7 +29,7 @@ import java.util.Iterator;
 import org.apache.log4j.Logger;
 
 import org.apache.isis.applib.Identifier;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -60,7 +60,7 @@ import org.apache.isis.core.runtime.pers
 import org.apache.isis.core.runtime.persistence.oidgenerator.OidGeneratorAware;
 
 public class AdapterManagerDefault extends AdapterManagerAbstract implements AdapterFactoryAware,
-    SpecificationLoaderAware, OidGeneratorAware, ServicesInjectorAware, DebugInfo {
+    SpecificationLoaderAware, OidGeneratorAware, ServicesInjectorAware, DebuggableWithTitle {
 
     private static final Logger LOG = Logger.getLogger(AdapterManagerDefault.class);
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerExtended.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerExtended.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerExtended.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerExtended.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.per
 
 import org.apache.isis.core.commons.components.Resettable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 
@@ -48,7 +48,7 @@ public interface AdapterManagerExtended 
                 AdapterManagerProxy, 
                 AdapterManagerTestSupport, 
                 AdapterManagerBackdoor, 
-                DebugInfo,
+                DebuggableWithTitle,
                 SessionScopedComponent {
 
     

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/OidAdapterMap.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/OidAdapterMap.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/OidAdapterMap.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/OidAdapterMap.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.per
 
 import org.apache.isis.core.commons.components.Resettable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.ad
 /**
  * A map of the objects' identities and the adapters' of the objects.
  */
-public interface OidAdapterMap extends DebugInfo, Iterable<Oid>, SessionScopedComponent, Resettable {
+public interface OidAdapterMap extends DebuggableWithTitle, Iterable<Oid>, SessionScopedComponent, Resettable {
 
     /**
      * Add an adapter for a given oid

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java Sat Jan  8 22:53:36 2011
@@ -22,11 +22,11 @@ package org.apache.isis.core.runtime.per
 
 import org.apache.isis.core.commons.components.Resettable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
-public interface PojoAdapterMap extends DebugInfo, Iterable<ObjectAdapter>, SessionScopedComponent, Resettable {
+public interface PojoAdapterMap extends DebuggableWithTitle, Iterable<ObjectAdapter>, SessionScopedComponent, Resettable {
 
     void add(Object pojo, ObjectAdapter adapter);
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/internal/RuntimeContextFromSession.java Sat Jan  8 22:53:36 2011
@@ -24,6 +24,9 @@ import java.util.List;
 
 import org.apache.isis.applib.ApplicationException;
 import org.apache.isis.applib.query.Query;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAbstract;
 import org.apache.isis.core.metamodel.adapter.DomainObjectServices;
 import org.apache.isis.core.metamodel.adapter.DomainObjectServicesAbstract;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -37,9 +40,6 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ServicesProviderAbstract;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.map.AdapterMapAbstract;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSessionProviderAbstract;
 import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
 import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacetUtils;
 import org.apache.isis.core.metamodel.runtimecontext.DependencyInjector;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisStoreLogger.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisStoreLogger.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisStoreLogger.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisStoreLogger.java Sat Jan  8 22:53:36 2011
@@ -22,11 +22,11 @@ package org.apache.isis.core.runtime.per
 
 import java.util.List;
 
+import org.apache.isis.core.commons.config.IsisConfigurationException;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.factory.InstanceCreationException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.config.ConfigurationException;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.core.runtime.logging.Logger;
@@ -117,7 +117,7 @@ public class IsisStoreLogger extends Log
         return isInitialized;
     }
 
-    public void open() throws ConfigurationException, InstanceCreationException, ObjectPersistenceException {
+    public void open() throws IsisConfigurationException, InstanceCreationException, ObjectPersistenceException {
         log("Opening " + name());
         decorated.open();
     }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistence.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistence.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistence.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistence.java Sat Jan  8 22:53:36 2011
@@ -21,9 +21,8 @@ package org.apache.isis.core.runtime.per
 
 import java.util.List;
 
-import org.apache.isis.core.commons.components.NamedComponent;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -37,7 +36,13 @@ import org.apache.isis.core.runtime.pers
 import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
 import org.apache.isis.core.runtime.persistence.query.PersistenceQuery;
 
-public interface ObjectStorePersistence extends DebugInfo, SessionScopedComponent, NamedComponent {
+public interface ObjectStorePersistence extends DebuggableWithTitle, SessionScopedComponent {
+
+
+    /**
+     * The name of this component.
+     */
+    String name();
 
     /**
      * Determine if the object store has been initialized with its set of start up objects.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers.
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.runtime.logging.Logger;
 import org.apache.isis.core.runtime.persistence.PersistenceMechanismInstallerAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStore.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStore.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStore.java Sat Jan  8 22:53:36 2011
@@ -29,13 +29,13 @@ import static org.hamcrest.CoreMatchers.
 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.commons.ensure.Assert;
 import org.apache.isis.core.commons.lang.ToString;
 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.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackUtils;
 import org.apache.isis.core.metamodel.facets.object.callbacks.LoadedCallbackFacet;
 import org.apache.isis.core.metamodel.facets.object.callbacks.LoadingCallbackFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.runtime.persistence.objectstore.transaction;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.context.IsisContext;
 
 public abstract class PersistenceCommandAbstract implements PersistenceCommand {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/OidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/OidGenerator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/OidGenerator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/OidGenerator.java Sat Jan  8 22:53:36 2011
@@ -22,18 +22,18 @@ package org.apache.isis.core.runtime.per
 
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
+import org.apache.isis.core.commons.encoding.Encodable;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
-import org.apache.isis.core.metamodel.encoding.Encodable;
 import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.core.runtime.persistence.oidgenerator.simple.SerialOid;
 
 
-public interface OidGenerator extends DebugInfo, SessionScopedComponent, Injectable {
+public interface OidGenerator extends DebuggableWithTitle, SessionScopedComponent, Injectable {
 
 
     /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOid.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOid.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/oidgenerator/simple/SerialOid.java Sat Jan  8 22:53:36 2011
@@ -26,13 +26,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
+
+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.commons.ensure.Assert;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
-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;
 
 
 public final class SerialOid implements Oid, Encodable, Serializable, DirectlyStringableOid {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryAbstract.java Sat Jan  8 22:53:36 2011
@@ -22,10 +22,10 @@ package org.apache.isis.core.runtime.per
 
 import java.io.IOException;
 
-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.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.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.context.IsisContext;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltIn.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltIn.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltIn.java Sat Jan  8 22:53:36 2011
@@ -21,7 +21,7 @@
 package org.apache.isis.core.runtime.persistence.query;
 
 import org.apache.isis.applib.DomainObjectContainer;
-import org.apache.isis.applib.Filter;
+import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 public interface PersistenceQueryBuiltIn extends PersistenceQuery {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,7 @@ package org.apache.isis.core.runtime.per
 import java.io.IOException;
 
 import org.apache.isis.applib.query.QueryBuiltInAbstract;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java Sat Jan  8 22:53:36 2011
@@ -26,10 +26,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.isis.applib.query.Query;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
 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.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java Sat Jan  8 22:53:36 2011
@@ -23,9 +23,9 @@ package org.apache.isis.core.runtime.per
 import java.io.IOException;
 
 import org.apache.isis.applib.query.Query;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
+import org.apache.isis.core.commons.encoding.DataOutputExtended;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.core.metamodel.encoding.DataInputExtended;
-import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/ServicesInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/ServicesInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/ServicesInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/ServicesInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 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.system.DeploymentType;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/config/ServicesFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/config/ServicesFromConfiguration.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/config/ServicesFromConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/services/config/ServicesFromConfiguration.java Sat Jan  8 22:53:36 2011
@@ -25,13 +25,14 @@ 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.config.ConfigurationConstants;
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.runtime.fixture.ObjectFixtureService;
 import org.apache.isis.core.runtime.persistence.services.InitialisationException;
 import org.apache.isis.core.runtime.persistence.services.ServicesInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisModule.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisModule.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisModule.java Sat Jan  8 22:53:36 2011
@@ -23,9 +23,9 @@ package org.apache.isis.core.runtime.run
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderDefault;
-import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
 import org.apache.isis.core.runtime.installers.InstallerLookup;
 import org.apache.isis.core.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.core.runtime.system.DeploymentType;
@@ -45,25 +45,25 @@ public class IsisModule extends Abstract
 
     private final DeploymentType deploymentType;
     private final InstallerLookup installerLookup;
-    private final ConfigurationBuilder configurationBuilder;
+    private final IsisConfigurationBuilder isisConfigurationBuilder;
 
-    private final List<ConfigurationPrimer> configurationPrimers = Lists.newArrayList();
+    private final List<IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers = Lists.newArrayList();
     private final List<String> viewerNames = Lists.newArrayList();
 
     private static InstallerLookupDefault defaultInstallerLookup() {
         return new InstallerLookupDefault(IsisModule.class);
     }
     
-    private static ConfigurationBuilderDefault defaultConfigurationBuider() {
-        return new ConfigurationBuilderDefault();
+    private static IsisConfigurationBuilderDefault defaultConfigurationBuider() {
+        return new IsisConfigurationBuilderDefault();
     }
     
     public IsisModule(DeploymentType deploymentType) {
         this(deploymentType, defaultConfigurationBuider(), defaultInstallerLookup());
     }
 
-    public IsisModule(DeploymentType deploymentType, ConfigurationBuilder configurationBuilder) {
-        this(deploymentType, configurationBuilder, defaultInstallerLookup());
+    public IsisModule(DeploymentType deploymentType, IsisConfigurationBuilder isisConfigurationBuilder) {
+        this(deploymentType, isisConfigurationBuilder, defaultInstallerLookup());
     }
     
     public IsisModule(DeploymentType deploymentType, InstallerLookup installerLookup) {
@@ -71,10 +71,10 @@ public class IsisModule extends Abstract
     }
     
     public IsisModule(DeploymentType deploymentType,
-            ConfigurationBuilder configurationBuilder,
+            IsisConfigurationBuilder isisConfigurationBuilder,
             InstallerLookup installerLookup) {
         this.installerLookup = installerLookup;
-        this.configurationBuilder = configurationBuilder;
+        this.isisConfigurationBuilder = isisConfigurationBuilder;
         this.deploymentType = deploymentType;
     }
 
@@ -94,13 +94,13 @@ public class IsisModule extends Abstract
     @SuppressWarnings("unused")
     @Provides
     @Singleton
-    private ConfigurationBuilder providesConfigurationBuilder() {
-        return primeConfiguration(configurationBuilder);
+    private IsisConfigurationBuilder providesConfigurationBuilder() {
+        return primeConfiguration(isisConfigurationBuilder);
     }
 
-    private ConfigurationBuilder primeConfiguration(final ConfigurationBuilder configBuilder) {
-        for (ConfigurationPrimer configurationPrimer : configurationPrimers) {
-            configurationPrimer.primeConfigurationBuilder(configBuilder);
+    private IsisConfigurationBuilder primeConfiguration(final IsisConfigurationBuilder configBuilder) {
+        for (IsisConfigurationBuilderPrimer isisConfigurationBuilderPrimer : isisConfigurationBuilderPrimers) {
+            isisConfigurationBuilderPrimer.primeConfigurationBuilder(configBuilder);
         }
         return configBuilder;
     }
@@ -114,7 +114,7 @@ public class IsisModule extends Abstract
     @Singleton
     @Inject
     private InstallerLookup providesInstallerLookup(
-            ConfigurationBuilder configBuilder) {
+            IsisConfigurationBuilder configBuilder) {
         // wire up and initialize installer lookup
         configBuilder.injectInto(installerLookup);
         installerLookup.init();
@@ -125,8 +125,8 @@ public class IsisModule extends Abstract
     /**
      * Adjustment (as per GOOS book)
      */
-    public void addConfigurationPrimers(List<? extends ConfigurationPrimer> configurationPrimers) {
-        this.configurationPrimers.addAll(configurationPrimers);
+    public void addConfigurationPrimers(List<? extends IsisConfigurationBuilderPrimer> isisConfigurationBuilderPrimers) {
+        this.isisConfigurationBuilderPrimers.addAll(isisConfigurationBuilderPrimers);
     }
 
     /**
@@ -140,7 +140,7 @@ public class IsisModule extends Abstract
     @Override
     protected void configure() {
         requireBinding(DeploymentType.class);
-        requireBinding(ConfigurationBuilder.class);
+        requireBinding(IsisConfigurationBuilder.class);
         requireBinding(InstallerLookup.class);
     }
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java Sat Jan  8 22:53:36 2011
@@ -29,10 +29,11 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
-import org.apache.isis.core.commons.lang.Maybe;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.core.metamodel.config.ConfigurationBuilderDefault;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+
+import org.apache.isis.applib.maybe.Maybe;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.installers.InstallerLookup;
 import org.apache.isis.core.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
@@ -75,7 +76,7 @@ public class IsisRunner {
 
     private final List<OptionHandler> optionHandlers = Lists.newArrayList();
     private final List<OptionValidator> validators = Lists.newArrayList();
-    private ConfigurationBuilder configurationBuilder = new ConfigurationBuilderDefault();
+    private IsisConfigurationBuilder isisConfigurationBuilder = new IsisConfigurationBuilderDefault();
 
     private Injector globalInjector;
 ;
@@ -134,7 +135,7 @@ public class IsisRunner {
     }
 
     /**
-     * The default implementation is a {@link ConfigurationBuilderDefault},
+     * The default implementation is a {@link IsisConfigurationBuilderDefault},
      * which looks to the <tt>config/</tt> directory, the
      * <tt>src/main/webapp/WEB-INF</tt> directory, and then finally to the
      * classpath. However, this could be a security concern in a production
@@ -142,16 +143,16 @@ public class IsisRunner {
      * config files to disable security, for example.
      * <p>
      * This method therefore allows this system to be configured using a
-     * different {@link ConfigurationBuilder}. For example, a security-conscious
-     * subclass could return a {@link ConfigurationBuilder} that only reads from
+     * different {@link IsisConfigurationBuilder}. For example, a security-conscious
+     * subclass could return a {@link IsisConfigurationBuilder} that only reads from
      * the classpath. This would allow the application to be deployed as a
      * single sealed JAR that could not be tampered with.
      * <p>
      * An adjustment (as per GOOS book).
      */
     public void setConfigurationBuilder(
-            ConfigurationBuilder configurationBuilder) {
-        this.configurationBuilder = configurationBuilder;
+            IsisConfigurationBuilder isisConfigurationBuilder) {
+        this.isisConfigurationBuilder = isisConfigurationBuilder;
     }
 
 
@@ -221,16 +222,16 @@ public class IsisRunner {
         final DeploymentType deploymentType = optionHandlerDeploymentType
                 .getDeploymentType();
         
-        this.globalInjector = createGuiceInjector(deploymentType, configurationBuilder, installerLookup, optionHandlers);
+        this.globalInjector = createGuiceInjector(deploymentType, isisConfigurationBuilder, installerLookup, optionHandlers);
 
         bootstrapper.bootstrap(globalInjector);
     }
 
     private Injector createGuiceInjector(DeploymentType deploymentType,
-            ConfigurationBuilder configurationBuilder,
+            IsisConfigurationBuilder isisConfigurationBuilder,
             InstallerLookup installerLookup,
             List<OptionHandler> optionHandlers) {
-        IsisModule isisModule = new IsisModule(deploymentType,configurationBuilder, installerLookup);
+        IsisModule isisModule = new IsisModule(deploymentType,isisConfigurationBuilder, installerLookup);
         isisModule.addConfigurationPrimers(optionHandlers);
         isisModule.addViewerNames(optionHandlerViewer.getViewerNames());
         return Guice.createInjector(isisModule);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionHandler.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionHandler.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionHandler.java Sat Jan  8 22:53:36 2011
@@ -22,10 +22,11 @@ package org.apache.isis.core.runtime.run
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
+
+import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
 import org.apache.isis.core.runtime.runner.BootPrinter;
 
-public interface OptionHandler extends ConfigurationPrimer {
+public interface OptionHandler extends IsisConfigurationBuilderPrimer {
 
 	public void addOption(Options options);
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidator.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.runner.options;
 
-import org.apache.isis.core.commons.lang.Maybe;
+import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.runtime.system.DeploymentType;
 
 public interface OptionValidator {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForConnector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForConnector.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForConnector.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForConnector.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.run
 
 import java.util.List;
 
-import org.apache.isis.core.commons.lang.Maybe;
+import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.runtime.options.standard.OptionHandlerConnector;
 import org.apache.isis.core.runtime.system.DeploymentType;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForPersistor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForPersistor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForPersistor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForPersistor.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.runner.options;
 
-import org.apache.isis.core.commons.lang.Maybe;
+import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.commons.lang.StringUtils;
 import org.apache.isis.core.runtime.options.standard.OptionHandlerPersistor;
 import org.apache.isis.core.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForViewers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForViewers.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForViewers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorForViewers.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.run
 
 import java.util.List;
 
-import org.apache.isis.core.commons.lang.Maybe;
+import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.runtime.options.standard.OptionHandlerViewer;
 import org.apache.isis.core.runtime.runner.IsisRunner;
 import org.apache.isis.core.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.runner.options;
 
-import org.apache.isis.core.commons.lang.Maybe;
+import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.runtime.options.standard.OptionHandlerPassword;
 import org.apache.isis.core.runtime.options.standard.OptionHandlerUser;
 import org.apache.isis.core.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java Sat Jan  8 22:53:36 2011
@@ -20,11 +20,11 @@
 
 package org.apache.isis.core.runtime.session;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
 import org.apache.isis.core.runtime.system.IsisSystem;
 import org.apache.isis.core.runtime.transaction.IsisTransaction;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionDefault.java Sat Jan  8 22:53:36 2011
@@ -27,12 +27,12 @@ import static org.hamcrest.CoreMatchers.
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.SessionScopedComponent;
-import org.apache.isis.core.commons.debug.DebugInfo;
+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.lang.ToString;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
 import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
@@ -299,8 +299,8 @@ public class IsisSessionDefault implemen
     }
 
     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.startSection(d.debugTitle());
             d.debugData(debug);
             debug.endSection();

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java Sat Jan  8 22:53:36 2011
@@ -22,9 +22,9 @@ package org.apache.isis.core.runtime.ses
 
 import java.util.List;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.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;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryAbstract.java Sat Jan  8 22:53:36 2011
@@ -27,10 +27,10 @@ import static org.apache.isis.core.commo
 
 import java.util.List;
 
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
-import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
-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;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.ses
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.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;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,6 @@
 
 package org.apache.isis.core.runtime.snapshot;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -37,10 +36,13 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import com.google.common.collect.Lists;
+
 import org.apache.isis.applib.snapshot.Snapshottable;
 import org.apache.isis.applib.snapshot.SnapshottableWithInclusions;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.map.AdapterMap;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -55,7 +57,6 @@ import org.apache.isis.core.metamodel.sp
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.PersistenceSession;
-import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager;
 
 
 /**
@@ -84,7 +85,7 @@ import org.apache.isis.core.runtime.pers
  * Element customerAsXml = snapshot.toXml();
  * </pre>
  */
-public final class XmlSnapshot {
+public class XmlSnapshot {
 
     private static final Logger LOG = Logger.getLogger(XmlSnapshot.class);
 
@@ -100,7 +101,7 @@ public final class XmlSnapshot {
 			private String path;
         	private String annotation;
         }
-        private List<PathAndAnnotation> paths = new ArrayList<PathAndAnnotation>();
+        private List<PathAndAnnotation> paths = Lists.newArrayList();
     	
     	public Builder(Snapshottable domainObject) {
 			this.snapshottable = domainObject;
@@ -118,7 +119,7 @@ public final class XmlSnapshot {
     	}
     	
     	public XmlSnapshot build() {
-    		ObjectAdapter adapter = getAdapterManager().adapterFor(snapshottable);
+    		ObjectAdapter adapter = getAdapterMap().adapterFor(snapshottable);
     		XmlSnapshot snapshot = (schema != null) ? 
     				new XmlSnapshot(adapter, schema) : 
     				new XmlSnapshot(adapter);
@@ -811,7 +812,7 @@ public final class XmlSnapshot {
 	// Dependencies (from context)
 	/////////////////////////////////////////////////////////
 	
-	private static AdapterManager getAdapterManager() {
+	private static AdapterMap getAdapterMap() {
 		return getPersistenceSession().getAdapterManager();
 	}
 	

Copied: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DebugSelection.java (from r1056120, incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugSelection.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DebugSelection.java?p2=incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DebugSelection.java&p1=incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugSelection.java&r1=1056120&r2=1056832&rev=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/commons/src/main/java/org/apache/isis/core/commons/debug/DebugSelection.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DebugSelection.java Sat Jan  8 22:53:36 2011
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.core.commons.debug;
+package org.apache.isis.core.runtime.system;
+
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 
 /**
  * Provides a mechanism for providing a series of DebugInfo objects, keyed on name.
  */ 
 public interface DebugSelection {
 
-    DebugInfo debugSection(String sectionName);
+    DebuggableWithTitle debugSection(String sectionName);
 
     public String[] debugSectionNames();
-    
-//    DebugInfo[] debug();
 }

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/DeploymentType.java Sat Jan  8 22:53:36 2011
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.sys
 
 import java.util.List;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.context.IsisContextStatic;
@@ -80,8 +80,8 @@ public class DeploymentType {
 		deploymentTypes.add(this);
 	}
 
-	public DebugInfo getDebug() {
-	    return new DebugInfo() {
+	public DebuggableWithTitle getDebug() {
+	    return new DebuggableWithTitle() {
 
             public void debugData(DebugString debug) {
                 debug.appendln("Category", deploymentCategory);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystem.java Sat Jan  8 22:53:36 2011
@@ -22,8 +22,7 @@ package org.apache.isis.core.runtime.sys
 
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.core.commons.debug.DebugSelection;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
 
 public interface IsisSystem extends DebugSelection, ApplicationScopedComponent {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemAbstract.java Sat Jan  8 22:53:36 2011
@@ -22,12 +22,14 @@ package org.apache.isis.core.runtime.sys
 import java.io.File;
 import java.util.List;
 
+import org.apache.log4j.Logger;
+
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.core.commons.components.NoopUtils;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.components.Noop;
+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.metamodel.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.runtime.about.AboutIsis;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
@@ -45,7 +47,6 @@ import org.apache.isis.core.runtime.syst
 import org.apache.isis.core.runtime.system.internal.IsisTimeZoneInitializer;
 import org.apache.isis.core.runtime.system.internal.SplashWindow;
 import org.apache.isis.core.runtime.userprofile.UserProfileStore;
-import org.apache.log4j.Logger;
 
 /**
  * 
@@ -148,7 +149,7 @@ public abstract class IsisSystemAbstract
         }
 
         fixtureInstaller = obtainFixturesInstaller();
-        if (fixtureInstaller == null || NoopUtils.isNoop(fixtureInstaller)) {
+        if (isNoop(fixtureInstaller)) {
             return;
         }
 
@@ -165,6 +166,10 @@ public abstract class IsisSystemAbstract
         }
     }
 
+    protected boolean isNoop(FixturesInstaller candidate) {
+        return candidate == null || (fixtureInstaller instanceof Noop);
+    }
+
     private void initContext(IsisSessionFactory sessionFactory) {
         getDeploymentType().initContext(sessionFactory);
     }
@@ -317,8 +322,8 @@ public abstract class IsisSystemAbstract
     // ///////////////////////////////////////////
 
     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 {
@@ -328,7 +333,7 @@ public abstract class IsisSystemAbstract
     }
 
     @Override
-    public DebugInfo debugSection(String selectionName) {
+    public DebuggableWithTitle debugSection(String selectionName) {
         // DebugInfo deb;
         if (selectionName.equals("Configuration")) {
             return getConfiguration();
@@ -402,7 +407,7 @@ public abstract class IsisSystemAbstract
             debug.appendln("Authentication manager", IsisContext.getAuthenticationManager().getClass().getName());
             debug.appendln("Configuration", getConfiguration().getClass().getName());
 
-            final DebugInfo[] inf = IsisContext.debugSystem();
+            final DebuggableWithTitle[] inf = IsisContext.debugSystem();
             for (int i = 0; i < inf.length; i++) {
                 if (inf[i] != null) {
                     inf[i].debugData(debug);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemSimple.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemSimple.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemSimple.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemSimple.java Sat Jan  8 22:53:36 2011
@@ -28,7 +28,7 @@ import static org.apache.isis.core.commo
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;
 import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/SystemConstants.java Sat Jan  8 22:53:36 2011
@@ -20,8 +20,8 @@
 
 package org.apache.isis.core.runtime.system;
 
-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.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.runtime.authentication.AuthenticationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/installers/IsisSystemUsingInstallers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/installers/IsisSystemUsingInstallers.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/installers/IsisSystemUsingInstallers.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.
 
 import java.util.List;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.core.metamodel.specloader.ObjectReflector;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/InitialisationSession.java Sat Jan  8 22:53:36 2011
@@ -22,8 +22,8 @@ package org.apache.isis.core.runtime.sys
 
 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.commons.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.commons.encoding.DataInputExtended;
 
 public final class InitialisationSession extends AuthenticationSessionAbstract {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java Sat Jan  8 22:53:36 2011
@@ -23,7 +23,8 @@ package org.apache.isis.core.runtime.sys
 import java.util.Locale;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.runtime.system.SystemConstants;
 
 public class IsisLocaleInitializer {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java Sat Jan  8 22:53:36 2011
@@ -23,8 +23,9 @@ package org.apache.isis.core.runtime.sys
 import java.util.TimeZone;
 
 import org.apache.log4j.Logger;
-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;
 
 public class IsisTimeZoneInitializer {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/AbstractServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/AbstractServerMonitor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/AbstractServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/AbstractServerMonitor.java Sat Jan  8 22:53:36 2011
@@ -32,7 +32,8 @@ import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.persistence.services.InitialisationException;
 import org.apache.isis.core.runtime.system.IsisSystem;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/HttpServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/HttpServerMonitor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/HttpServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/HttpServerMonitor.java Sat Jan  8 22:53:36 2011
@@ -26,7 +26,8 @@ import java.net.URLDecoder;
 import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.IsisSystem;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/Monitor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/Monitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/Monitor.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 
 
 public class Monitor {
@@ -43,7 +43,7 @@ public class Monitor {
         addEvent(category, message, null);
     }
 
-    public static void addEvent(final String category, final String message, DebugInfo[] debug) {
+    public static void addEvent(final String category, final String message, DebuggableWithTitle[] debug) {
         final MonitorEvent event = new MonitorEvent(category, message, debug);
         LOG.info(event);
         dispatchEvent(event);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorEvent.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorEvent.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorEvent.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorEvent.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.system.internal.monitor;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 
 
@@ -31,13 +31,13 @@ public class MonitorEvent {
     private final String category;
     private DebugString debug;
 
-    public MonitorEvent(final String category, final String message, DebugInfo[] debugDetails) {
+    public MonitorEvent(final String category, final String message, DebuggableWithTitle[] debugDetails) {
         this.message = message;
         this.category = category;
         debug = new DebugString();
         try {
             if (debugDetails != null) {
-                for (DebugInfo info : debugDetails) {
+                for (DebuggableWithTitle info : debugDetails) {
                     debug.appendTitle(info.debugTitle());
                     debug.indent();
                     info.debugData(debug);

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorListenerImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorListenerImpl.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorListenerImpl.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/MonitorListenerImpl.java Sat Jan  8 22:53:36 2011
@@ -27,7 +27,7 @@ import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+import org.apache.isis.core.commons.debug.DebuggableWithTitle;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.runtime.context.IsisContext;
@@ -60,7 +60,7 @@ public class MonitorListenerImpl impleme
 
         final StringBuffer navigation = new StringBuffer("<p>");
 //        final String[] options = target.debugSectionNames();
-        DebugInfo[] infos = IsisContext.debugSystem();
+        DebuggableWithTitle[] infos = IsisContext.debugSystem();
         for (int i = 0; i < infos.length; i++) {
             String name = infos[i].debugTitle();
             appendNavigationLink(navigation, name, i > 0);
@@ -121,7 +121,7 @@ public class MonitorListenerImpl impleme
 
         writer.println(sectionName);
 
-        DebugInfo[] infos = IsisContext.debugSystem();
+        DebuggableWithTitle[] infos = IsisContext.debugSystem();
         if (sectionName.equals("Events")) {
             int i = 1;
             for(MonitorEvent event: requests) {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SocketServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SocketServerMonitor.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SocketServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SocketServerMonitor.java Sat Jan  8 22:53:36 2011
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URLDecoder;
 
-import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.context.IsisContext;
 import org.apache.isis.core.runtime.system.IsisSystem;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SystemPrinter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SystemPrinter.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SystemPrinter.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/monitor/SystemPrinter.java Sat Jan  8 22:53:36 2011
@@ -30,7 +30,7 @@ import java.util.Properties;
 import java.util.TimeZone;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.core.commons.io.IoUtils;
+import org.apache.isis.core.commons.lang.IoUtils;
 import org.apache.isis.core.runtime.about.AboutIsis;
 
 public class SystemPrinter {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.transaction.facetdecorator;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/TransactionFacetDecoratorInstallerAbstract.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.transaction.facetdecorator;
 
-import org.apache.isis.core.metamodel.config.InstallerAbstract;
+import org.apache.isis.core.commons.config.InstallerAbstract;
 import org.apache.isis.core.metamodel.specloader.FacetDecoratorInstaller;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java Sat Jan  8 22:53:36 2011
@@ -20,7 +20,7 @@
 
 package org.apache.isis.core.runtime.transaction.facetdecorator.standard;
 
-import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.commons.config.IsisConfiguration;
 import org.apache.isis.core.metamodel.facetapi.Facet;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/messagebroker/MessageBrokerDefault.java Sat Jan  8 22:53:36 2011
@@ -24,13 +24,13 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.core.commons.debug.DebugInfo;
+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.commons.lang.StringUtils;
 
 
-public class MessageBrokerDefault implements MessageBroker, DebugInfo {
+public class MessageBrokerDefault implements MessageBroker, DebuggableWithTitle {
     
     private final List<String> messages = new ArrayList<String>();
     private final List<String> warnings = new ArrayList<String>();

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/updatenotifier/UpdateNotifierDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/updatenotifier/UpdateNotifierDefault.java?rev=1056832&r1=1056831&r2=1056832&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/updatenotifier/UpdateNotifierDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/updatenotifier/UpdateNotifierDefault.java Sat Jan  8 22:53:36 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.core.commons.debug.DebugInfo;
+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.commons.lang.ToString;
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 
 
-public class UpdateNotifierDefault extends UpdateNotifierAbstract implements DebugInfo {
+public class UpdateNotifierDefault extends UpdateNotifierAbstract implements DebuggableWithTitle {
 	
     private static final Logger LOG = Logger.getLogger(UpdateNotifierDefault.class);
     private final List<ObjectAdapter> changes = new ArrayList<ObjectAdapter>();



Mime
View raw message