incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1032543 [17/26] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassi...
Date Mon, 08 Nov 2010 11:23:54 GMT
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Mon Nov  8 11:23:08 2010
@@ -23,14 +23,14 @@ package org.apache.isis.runtime.persiste
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.exceptions.UnknownTypeException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.util.CallbackUtils;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.util.CallbackUtils;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 import org.apache.isis.runtime.transaction.ObjectPersistenceException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java Mon Nov  8 11:23:08 2010
@@ -25,15 +25,15 @@ import java.util.Enumeration;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.util.CallbackUtils;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.util.CallbackUtils;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 import org.apache.isis.runtime.transaction.ObjectPersistenceException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/twopass/TwoPassPersistAlgorithm.java Mon Nov  8 11:23:08 2010
@@ -25,15 +25,15 @@ import java.util.Enumeration;
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.util.CallbackUtils;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistedCallbackFacet;
 import org.apache.isis.metamodel.facets.object.callbacks.PersistingCallbackFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.util.CallbackUtils;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
 import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java Mon Nov  8 11:23:08 2010
@@ -26,8 +26,8 @@ import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.runtime.persistence.objectstore.ObjectStoreTransactionManagement;
 import org.apache.isis.runtime.transaction.IsisTransactionAbstract;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommand.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommand.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.persistence.objectstore.transaction;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 public interface PersistenceCommand {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.persistence.objectstore.transaction;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.context.IsisContext;
 
 public abstract class PersistenceCommandAbstract implements PersistenceCommand {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGenerator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGenerator.java Mon Nov  8 11:23:08 2010
@@ -23,12 +23,12 @@ package org.apache.isis.runtime.persiste
 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.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
-import org.apache.isis.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
-import org.apache.isis.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
-import org.apache.isis.metamodel.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.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGeneratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGeneratorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGeneratorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/OidGeneratorAbstract.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.persistence.oidgenerator;
 
-import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
-import org.apache.isis.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
 
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/package-info.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/package-info.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@
  * 
  * <p>
  * Used by object store implementations to specify how to manufacture
- * {@link org.apache.isis.metamodel.adapter.oid.Oid}s (permanent unique identifiers
+ * {@link org.apache.isis.core.metamodel.adapter.oid.Oid}s (permanent unique identifiers
  * for each domain object managed by Apache Isis).  For example, an
  * in-memory object store will just use a unique Id, whereas a generator
  * for Hibernate will hook into Hibernate's own identity generators.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOid.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOid.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SerialOid.java Mon Nov  8 11:23:08 2010
@@ -27,12 +27,12 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
+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/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java Mon Nov  8 11:23:08 2010
@@ -25,8 +25,8 @@ import static org.apache.isis.core.commo
 import static org.apache.isis.core.commons.matchers.NofMatchers.greaterThan;
 
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.directly.OidStringifierDirect;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.OidStringifierDirect;
 import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
 import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/timebased/TimeBasedOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/timebased/TimeBasedOidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/timebased/TimeBasedOidGenerator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/oidgenerator/timebased/TimeBasedOidGenerator.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.persiste
 
 import java.util.Date;
 
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQuery.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQuery.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQuery.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQuery.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.persistence.query;
 
 import org.apache.isis.applib.query.Query;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryAbstract.java Mon Nov  8 11:23:08 2010
@@ -22,11 +22,11 @@ package org.apache.isis.runtime.persiste
 
 import java.io.IOException;
 
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataInputStreamExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
-import org.apache.isis.metamodel.encoding.Encodable;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.context.IsisContext;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltIn.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltIn.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltIn.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.persiste
 
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.Filter;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+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/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryBuiltInAbstract.java Mon Nov  8 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.persiste
 
 import java.io.IOException;
 
-import org.apache.isis.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.services.container.query.QueryBuiltInAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 /**
  * Corresponds to {@link QueryBuiltInAbstract}.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindAllInstances.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.runtime.persistence.query;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByPattern.java Mon Nov  8 11:23:08 2010
@@ -19,10 +19,10 @@
 
 package org.apache.isis.runtime.persistence.query;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
 import org.apache.isis.metamodel.services.container.query.QueryFindByPattern;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
 
 /**
  * Corresponds to {@link QueryFindByPattern}.

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindByTitle.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.runtime.persistence.query;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.services.container.query.QueryFindByTitle;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQueryDefault.java Mon Nov  8 11:23:08 2010
@@ -27,11 +27,11 @@ import java.util.Map;
 
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.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.spec.ObjectSpecification;
 import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/query/PersistenceQueryFindUsingApplibQuerySerializable.java Mon Nov  8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.io.IOException;
 
 import org.apache.isis.applib.query.Query;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.services.container.query.QueryCardinality;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/RepositoryHelper.java Mon Nov  8 11:23:08 2010
@@ -23,13 +23,13 @@ package org.apache.isis.runtime.persiste
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.query.PersistenceQuery;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/SimpleRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/SimpleRepository.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/SimpleRepository.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/SimpleRepository.java Mon Nov  8 11:23:08 2010
@@ -21,8 +21,8 @@
 package org.apache.isis.runtime.persistence.services;
 
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java Mon Nov  8 11:23:08 2010
@@ -29,8 +29,8 @@ import org.apache.isis.core.commons.fact
 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.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.fixture.ObjectFixtureService;
 import org.apache.isis.runtime.installers.InstallerAbstract;
 import org.apache.isis.runtime.persistence.services.InitialisationException;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/package-info.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/package-info.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/remoting/package-info.java Mon Nov  8 11:23:08 2010
@@ -25,7 +25,7 @@
  * Defines two installers, one for client and one for server:
  * <ul>
  * <li> the {@link ClientConnectionInstaller} is an extension of {@link org.apache.isis.runtime.persistence.PersistenceMechanismInstaller},
- *      intended to install a <tt>persistor-proxy</tt> as well as any additional {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s
+ *      intended to install a <tt>persistor-proxy</tt> as well as any additional {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s
  *      for authentication, authorisation and so forth.  The implementation must specify the marshalling mechanism (encoding, xstream etc) as
  *      well as the transport (sockets etc).
  * <li> the {@link IsisViewerInstaller} sets up a listener to run on the server,

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisModule.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisModule.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisModule.java Mon Nov  8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.runtime.runner;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderDefault;
-import org.apache.isis.metamodel.config.ConfigurationPrimer;
+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.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.runtime.system.DeploymentType;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisRunner.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisRunner.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/IsisRunner.java Mon Nov  8 11:23:08 2010
@@ -30,9 +30,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.isis.core.commons.lang.Maybe;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderDefault;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+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.runtime.installers.InstallerLookup;
 import org.apache.isis.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.runtime.logging.IsisLoggingConfigurer;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/options/OptionHandler.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/options/OptionHandler.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/options/OptionHandler.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/runner/options/OptionHandler.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.runner.o
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
-import org.apache.isis.metamodel.config.ConfigurationPrimer;
+import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
 import org.apache.isis.runtime.runner.BootPrinter;
 
 public interface OptionHandler extends ConfigurationPrimer {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.session;
 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.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.system.IsisSystem;
 import org.apache.isis.runtime.transaction.IsisTransaction;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java Mon Nov  8 11:23:08 2010
@@ -31,8 +31,8 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.imageloader.TemplateImageLoader;
 import org.apache.isis.runtime.persistence.PersistenceSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.session;
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java Mon Nov  8 11:23:08 2010
@@ -29,8 +29,8 @@ import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.lang.JavaClassUtils;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.session;
 
 import java.util.List;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.SpecificationLoader;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authorization.AuthorizationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/NofMetaModel.java Mon Nov  8 11:23:08 2010
@@ -21,9 +21,9 @@
 package org.apache.isis.runtime.snapshot;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/Place.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/Place.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/Place.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/Place.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.snapshot;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.w3c.dom.Element;
 
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/snapshot/XmlSnapshot.java Mon Nov  8 11:23:08 2010
@@ -35,19 +35,19 @@ import org.apache.log4j.Logger;
 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.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.oid.stringable.directly.DirectlyStringableOid;
+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.directly.DirectlyStringableOid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.metamodel.facets.FacetUtil;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
 import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
 import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.metamodel.facets.object.value.ValueFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecificationException;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystem.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystem.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.system;
 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.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.session.IsisSessionFactory;
 
 public interface IsisSystem extends DebugSelection, ApplicationScopedComponent {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java Mon Nov  8 11:23:08 2010
@@ -27,7 +27,7 @@ import org.apache.isis.core.commons.comp
 import org.apache.isis.core.commons.components.NoopUtils;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.about.AboutIsis;
 import org.apache.isis.runtime.authentication.AuthenticationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java Mon Nov  8 11:23:08 2010
@@ -28,7 +28,7 @@ import static org.apache.isis.core.commo
 
 import java.util.List;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.fixturesinstaller.FixturesInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.system;
 
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.runtime.authentication.AuthenticationManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java Mon Nov  8 11:23:08 2010
@@ -25,8 +25,8 @@ import java.util.Map;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.i18n.resourcebundle.I18nFacetDecorator;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java Mon Nov  8 11:23:08 2010
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.
 
 import java.util.List;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
 import org.apache.isis.metamodel.specloader.ObjectReflector;
 import org.apache.isis.metamodel.specloader.ObjectReflectorInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/InitialisationSession.java Mon Nov  8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.system.i
 
 import java.io.IOException;
 
-import org.apache.isis.metamodel.authentication.AuthenticationSessionAbstract;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
 
 public final class InitialisationSession extends AuthenticationSessionAbstract {
 	

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisLocaleInitializer.java Mon Nov  8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.system.i
 import java.util.Locale;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.system.SystemConstants;
 
 public class IsisLocaleInitializer {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/IsisTimeZoneInitializer.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.system.i
 import java.util.TimeZone;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 
 public class IsisTimeZoneInitializer {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/AbstractServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/AbstractServerMonitor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/AbstractServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/AbstractServerMonitor.java Mon Nov  8 11:23:08 2010
@@ -32,7 +32,7 @@ import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.services.InitialisationException;
 import org.apache.isis.runtime.system.IsisSystem;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/HttpServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/HttpServerMonitor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/HttpServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/HttpServerMonitor.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import java.net.URLDecoder;
 import java.util.StringTokenizer;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.system.IsisSystem;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SocketServerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SocketServerMonitor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SocketServerMonitor.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/monitor/SocketServerMonitor.java Mon Nov  8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.URLDecoder;
 
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.system.IsisSystem;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecorator.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facetdecorator;
 
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 
 
 public interface TransactionFacetDecorator extends FacetDecorator {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/TransactionFacetDecoratorAbstract.java Mon Nov  8 11:23:08 2010
@@ -20,8 +20,8 @@
 
 package org.apache.isis.runtime.transaction.facetdecorator;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecoratorAbstract;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecoratorAbstract;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/StandardTransactionFacetDecorator.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facetdecorator.standard;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.FacetHolder;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/TransactionFacetDecoratorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/TransactionFacetDecoratorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/TransactionFacetDecoratorInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facetdecorator/standard/TransactionFacetDecoratorInstaller.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.transact
 
 import java.util.List;
 
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
 import org.apache.isis.runtime.transaction.facetdecorator.TransactionFacetDecoratorInstallerAbstract;
 
 import com.google.common.collect.Lists;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -21,11 +21,11 @@
 package org.apache.isis.runtime.transaction.facets;
 
 import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacet;
 import org.apache.isis.metamodel.facets.actions.invoke.ActionInvocationFacetAbstract;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.transaction.IsisTransactionManager;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionAddToFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facets;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacetAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionClearFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facets;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionClearFacetAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/CollectionRemoveFromFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facets;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionRemoveFromFacetAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertyClearFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facets;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
 import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacetAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/facets/PropertySetterFacetWrapTransaction.java Mon Nov  8 11:23:08 2010
@@ -20,7 +20,7 @@
 
 package org.apache.isis.runtime.transaction.facets;
 
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.metamodel.facets.DecoratingFacet;
 import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
 import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacetAbstract;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifier.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifier.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifier.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifier.java Mon Nov  8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.isis.core.commons.components.Injectable;
 import org.apache.isis.core.commons.components.TransactionScopedComponent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 /**
  * UpdateNotifier provides updates to client making available lists of the

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifierDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifierDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifierDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/transaction/updatenotifier/UpdateNotifierDefault.java Mon Nov  8 11:23:08 2010
@@ -29,8 +29,8 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
 import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
 
 
 public class UpdateNotifierDefault extends UpdateNotifierAbstract implements DebugInfo {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/PerspectiveEntry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/PerspectiveEntry.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/PerspectiveEntry.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/PerspectiveEntry.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtime.persistence.services.ServiceUtil;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfile.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfile.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfile.java Mon Nov  8 11:23:08 2010
@@ -26,7 +26,7 @@ import java.util.List;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 
 
 public class UserProfile implements DebugInfo {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoader.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoader.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoader.java Mon Nov  8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.runtime.userprof
 import java.util.List;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 
 /**

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileLoaderDefault.java Mon Nov  8 11:23:08 2010
@@ -24,8 +24,8 @@ import java.util.List;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
 import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.context.IsisContext;
 import org.apache.isis.runtime.persistence.PersistenceSession;
 import org.apache.isis.runtime.session.IsisSession;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileStoreInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileStoreInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileStoreInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/UserProfileStoreInstaller.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.userprofile;
 
 import org.apache.isis.core.commons.components.Installer;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 
 public interface UserProfileStoreInstaller extends Installer {
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/inmemory/InMemoryUserProfileStoreInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/inmemory/InMemoryUserProfileStoreInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/inmemory/InMemoryUserProfileStoreInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/userprofile/inmemory/InMemoryUserProfileStoreInstaller.java Mon Nov  8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.userprof
 
 import java.util.List;
 
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
 import org.apache.isis.runtime.installers.InstallerAbstract;
 import org.apache.isis.runtime.userprofile.UserProfileStore;
 import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/util/Dump.java Mon Nov  8 11:23:08 2010
@@ -26,19 +26,19 @@ import java.util.Vector;
 import org.apache.isis.core.commons.debug.Debug;
 import org.apache.isis.core.commons.debug.DebugInfo;
 import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.SpecificationFacets;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.metamodel.util.SpecUtils;
 import org.apache.isis.metamodel.facets.Facet;
 import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.SpecificationFacets;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.metamodel.spec.feature.ObjectActionType;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
-import org.apache.isis.metamodel.util.CollectionFacetUtils;
-import org.apache.isis.metamodel.util.SpecUtils;
 
 
 public final class Dump {

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewer.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewer.java Mon Nov  8 11:23:08 2010
@@ -21,7 +21,7 @@
 package org.apache.isis.runtime.viewer;
 
 import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.config.ConfigurationBuilderAware;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderAware;
 import org.apache.isis.runtime.installers.InstallerLookupAware;
 import org.apache.isis.runtime.web.WebAppSpecification;
 

Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/viewer/IsisViewerAbstract.java Mon Nov  8 11:23:08 2010
@@ -22,9 +22,9 @@ package org.apache.isis.runtime.viewer;
 
 import org.apache.isis.applib.fixtures.LogonFixture;
 import org.apache.isis.core.commons.ensure.Ensure;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderAware;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+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.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;



Mime
View raw message