You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/08 12:23:54 UTC
svn commit: r1032543 [2/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/javassis...
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Mon Nov 8 11:23:08 2010
@@ -29,11 +29,11 @@ import javassist.util.proxy.ProxyObject;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.ArrayUtils;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.java5.ImperativeFacet;
import org.apache.isis.metamodel.java5.ImperativeFacetUtils;
import org.apache.isis.metamodel.java5.ImperativeFacetUtils.ImperativeFacetFlags;
import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.bytecode.ObjectResolveAndObjectChangedEnhancerAbstract;
import org.apache.isis.runtime.persistence.objectfactory.ObjectChanger;
Modified: incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/specloader/classsubstitutor/JavassistClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/specloader/classsubstitutor/JavassistClassSubstitutor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/specloader/classsubstitutor/JavassistClassSubstitutor.java (original)
+++ incubator/isis/trunk/alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/specloader/classsubstitutor/JavassistClassSubstitutor.java Mon Nov 8 11:23:08 2010
@@ -21,8 +21,8 @@
package org.apache.isis.bytecode.javassist.specloader.classsubstitutor;
import org.apache.isis.bytecode.javassist.persistence.objectfactory.internal.JavassistEnhanced;
+import org.apache.isis.core.metamodel.util.ClassUtil;
import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutorAbstract;
-import org.apache.isis.metamodel.util.ClassUtil;
public class JavassistClassSubstitutor extends ClassSubstitutorAbstract {
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContext.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.alternatives.embedded.internal.PersistenceState;
import org.apache.isis.applib.query.Query;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
public interface EmbeddedContext {
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/EmbeddedContextNoop.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.isis.alternatives.embedded.internal.PersistenceState;
import org.apache.isis.applib.query.Query;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
public class EmbeddedContextNoop implements EmbeddedContext {
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/IsisMetaModel.java Mon Nov 8 11:23:08 2010
@@ -35,13 +35,13 @@ import java.util.TreeSet;
import org.apache.isis.alternatives.embedded.internal.RuntimeContextForEmbeddedMetaModel;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.spec.IntrospectableSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.services.ServicesInjector;
import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault;
-import org.apache.isis.metamodel.spec.IntrospectableSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.JavaReflector;
import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/RuntimeContextForEmbeddedMetaModel.java Mon Nov 8 11:23:08 2010
@@ -30,12 +30,12 @@ import org.apache.isis.alternatives.embe
import org.apache.isis.alternatives.embedded.internal.StandaloneAdapter;
import org.apache.isis.applib.query.Query;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification.CreationMode;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContextAbstract;
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/ServiceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/ServiceAdapter.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/ServiceAdapter.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/ServiceAdapter.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.alternatives.embedded.internal;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class ServiceAdapter extends StandaloneAdapter {
Modified: incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/main/java/org/apache/isis/alternatives/embedded/internal/StandaloneAdapter.java Mon Nov 8 11:23:08 2010
@@ -20,15 +20,15 @@
package org.apache.isis.alternatives.embedded.internal;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ObjectMetaModel;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectMetaModel;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Specification;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Specification;
/**
* Only provides a concrete implementation of the methods corresponding to
Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenEmbeddedViewerAndPersistentDomainObject.java Mon Nov 8 11:23:08 2010
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.progmodel.wrapper.applib.DisabledException;
import org.apache.isis.progmodel.wrapper.applib.HiddenException;
import org.apache.isis.progmodel.wrapper.applib.InvalidException;
@@ -43,6 +42,7 @@ import org.apache.isis.alternatives.embe
import org.apache.isis.alternatives.embedded.dom.employee.Employee;
import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl;
import org.apache.isis.alternatives.embedded.internal.PersistenceState;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenInitialize.java Mon Nov 8 11:23:08 2010
@@ -28,8 +28,6 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
@@ -37,6 +35,8 @@ import org.apache.isis.alternatives.embe
import org.apache.isis.alternatives.embedded.IsisMetaModel;
import org.apache.isis.alternatives.embedded.dom.claim.ClaimRepositoryImpl;
import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
@RunWith(JMock.class)
public class GivenMetaModelWhenInitialize {
Modified: incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java (original)
+++ incubator/isis/trunk/alternatives/embedded/src/test/java/org/apache/isis/alternatives/embedded/GivenMetaModelWhenShutdown.java Mon Nov 8 11:23:08 2010
@@ -28,8 +28,6 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
@@ -37,6 +35,8 @@ import org.apache.isis.alternatives.embe
import org.apache.isis.alternatives.embedded.IsisMetaModel;
import org.apache.isis.alternatives.embedded.dom.claim.ClaimRepositoryImpl;
import org.apache.isis.alternatives.embedded.dom.employee.EmployeeRepositoryImpl;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
@RunWith(JMock.class)
public class GivenMetaModelWhenShutdown {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerPersistorMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerPersistorMechanismInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerPersistorMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/file/FileServerPersistorMechanismInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.extensions.file;
-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.extensions.nosql.NoSqlDataDatabase;
import org.apache.isis.extensions.nosql.NoSqlPersistorMechanismInstaller;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoDb.java Mon Nov 8 11:23:08 2010
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.extensions.nosql.KeyCreator;
import org.apache.isis.extensions.nosql.NoSqlCommandContext;
import org.apache.isis.extensions.nosql.NoSqlDataDatabase;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoPersistorMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoPersistorMechanismInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoPersistorMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/mongo/MongoPersistorMechanismInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.extensions.mongo;
-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.extensions.nosql.KeyCreator;
import org.apache.isis.extensions.nosql.NoSqlDataDatabase;
import org.apache.isis.extensions.nosql.NoSqlPersistorMechanismInstaller;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementation.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.extensions.nosql;
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.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/KeyCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/KeyCreator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/KeyCreator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/KeyCreator.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.nosql;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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;
public interface KeyCreator {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlObjectStore.java Mon Nov 8 11:23:08 2010
@@ -28,11 +28,11 @@ import java.util.Map;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlOidGenerator.java Mon Nov 8 11:23:08 2010
@@ -24,8 +24,8 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/NoSqlPersistorMechanismInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.nosql;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegating;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/ObjectReader.java Mon Nov 8 11:23:08 2010
@@ -23,18 +23,18 @@ package org.apache.isis.extensions.nosql
import java.util.List;
import org.apache.isis.core.commons.exceptions.UnexpectedCallException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationContainer;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociationContainer;
-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.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialKeyCreator.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.nosql;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialNumberVersionCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialNumberVersionCreator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialNumberVersionCreator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/SerialNumberVersionCreator.java Mon Nov 8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.extensions.nosql
import java.util.Date;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.adapter.version.Version;
public class SerialNumberVersionCreator implements VersionCreator {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/VersionCreator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/VersionCreator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/VersionCreator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/VersionCreator.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.nosql;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.version.Version;
public interface VersionCreator {
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/main/java/org/apache/isis/extensions/nosql/WriteObjectCommand.java Mon Nov 8 11:23:08 2010
@@ -24,11 +24,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.isis.core.commons.lang.ToString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/MongoDbTest.java Mon Nov 8 11:23:08 2010
@@ -24,8 +24,8 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-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.extensions.nosql.ExampleValuePojo;
import org.apache.isis.extensions.nosql.SerialKeyCreator;
import org.apache.isis.extensions.nosql.TrialObjects;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/mongo/ObjectTest.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ package org.apache.isis.extensions.mongo
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.extensions.nosql.ExampleValuePojo;
import org.apache.isis.extensions.nosql.TrialObjects;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/DestroyObjectCommandImplementationTest.java Mon Nov 8 11:23:08 2010
@@ -28,9 +28,9 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/NoSqlObjectStoreTest.java Mon Nov 8 11:23:08 2010
@@ -29,9 +29,9 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/ObjectReaderTest.java Mon Nov 8 11:23:08 2010
@@ -28,9 +28,9 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SerialKeyCreatorTest.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
import org.apache.isis.runtime.testsystem.TestProxySystemII;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SystemTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SystemTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SystemTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/SystemTest.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.extensions.nosql
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.commons.debug.DebugString;
-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.testsystem.TestProxySystemII;
import org.apache.isis.runtime.util.Dump;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/TrialObjects.java Mon Nov 8 11:23:08 2010
@@ -23,14 +23,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+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.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.specloader.JavaReflector;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
Modified: incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/WriteObjectCommandTest.java Mon Nov 8 11:23:08 2010
@@ -26,10 +26,10 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SerialOid;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/AbstractMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/AbstractMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/AbstractMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/AbstractMapper.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.sql.o
import java.util.Date;
import java.util.Hashtable;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.extensions.sql.objectstore.SqlOid.State;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/CollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/CollectionMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/CollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/CollectionMapper.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.extensions.sql.objectstore;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public interface CollectionMapper {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/FieldMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/FieldMappingLookup.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/FieldMappingLookup.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/FieldMappingLookup.java Mon Nov 8 11:23:08 2010
@@ -26,8 +26,8 @@ import java.util.Map;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcGeneralValueMapper;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMapping.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class IdMapping extends IdMappingAbstract {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/IdMappingAbstract.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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;
import org.apache.isis.extensions.sql.objectstore.SqlOid.State;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMapping.java Mon Nov 8 11:23:08 2010
@@ -20,10 +20,10 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+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;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByPattern;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMappingLookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMappingLookup.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMappingLookup.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/ObjectMappingLookup.java Mon Nov 8 11:23:08 2010
@@ -30,9 +30,9 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.factory.InstanceCreationException;
import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlObjectStore.java Mon Nov 8 11:23:08 2010
@@ -27,10 +27,10 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+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;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.objectstore.ObjectStore;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOid.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOid.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOid.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOid.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@ package org.apache.isis.extensions.sql.o
import java.io.IOException;
import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.encoding.DataInputExtended;
-import org.apache.isis.metamodel.encoding.DataOutputExtended;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.encoding.DataInputExtended;
+import org.apache.isis.core.metamodel.encoding.DataOutputExtended;
public final class SqlOid implements Oid {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlOidGenerator.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.extensions.sql.o
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.ensure.Assert;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.extensions.sql.objectstore.auto.AutoMapper;
import org.apache.isis.runtime.persistence.oidgenerator.OidGeneratorAbstract;
import org.apache.isis.runtime.transaction.ObjectPersistenceException;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/SqlPersistorInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.extensions.sql.objectstore.auto.AutoMapperFactory;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcConnectorFactory;
import org.apache.isis.extensions.sql.objectstore.jdbc.JdbcFieldMappingFactoryInstaller;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/TitleMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/TitleMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/TitleMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/TitleMapping.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.sql.objectstore;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class TitleMapping {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/VersionMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/VersionMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/VersionMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/VersionMapping.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.extensions.sql.o
import java.sql.Timestamp;
import java.util.Date;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.adapter.version.Version;
public class VersionMapping {
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AbstractAutoMapper.java Mon Nov 8 11:23:08 2010
@@ -26,12 +26,12 @@ import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.AbstractMapper;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoCollectionMapper.java Mon Nov 8 11:23:08 2010
@@ -25,12 +25,12 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
-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.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.AbstractMapper;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/AutoMapper.java Mon Nov 8 11:23:08 2010
@@ -25,12 +25,12 @@ import java.util.Vector;
import org.apache.log4j.Logger;
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.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+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.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/CombinedCollectionMapper.java Mon Nov 8 11:23:08 2010
@@ -25,11 +25,11 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+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.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/MultiColumnCombinedCollectionMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/MultiColumnCombinedCollectionMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/MultiColumnCombinedCollectionMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/MultiColumnCombinedCollectionMapper.java Mon Nov 8 11:23:08 2010
@@ -23,9 +23,9 @@
*/
package org.apache.isis.extensions.sql.objectstore.auto;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.specloader.internal.OneToManyAssociationImpl;
import org.apache.isis.metamodel.specloader.internal.peer.ObjectAssociationPeer;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
import org.apache.isis.extensions.sql.objectstore.ObjectMappingLookup;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/auto/ReversedAutoAssociationMapper.java Mon Nov 8 11:23:08 2010
@@ -26,12 +26,12 @@ import java.util.List;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.ResolveState;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
+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.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.CollectionMapper;
import org.apache.isis.extensions.sql.objectstore.DatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.FieldMappingLookup;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/AbstractJdbcFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/AbstractJdbcFieldMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/AbstractJdbcFieldMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/AbstractJdbcFieldMapping.java Mon Nov 8 11:23:08 2010
@@ -21,9 +21,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.extensions.sql.objectstore.Results;
import org.apache.isis.extensions.sql.objectstore.Sql;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcConnector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcConnector.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcConnector.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcConnector.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import java.sql.SQLException;
import org.apache.log4j.Logger;
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.extensions.sql.objectstore.AbstractDatabaseConnector;
import org.apache.isis.extensions.sql.objectstore.Results;
import org.apache.isis.extensions.sql.objectstore.SqlMetaData;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateMapper.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateTimeMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateTimeMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateTimeMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcDateTimeMapper.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcGeneralValueMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcGeneralValueMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcGeneralValueMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcGeneralValueMapper.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.Sql;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceFieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceFieldMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceFieldMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceFieldMapping.java Mon Nov 8 11:23:08 2010
@@ -21,9 +21,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.extensions.sql.objectstore.Results;
import org.apache.isis.extensions.sql.objectstore.Sql;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMapping.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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;
import org.apache.isis.extensions.sql.objectstore.IdMappingAbstract;
import org.apache.isis.extensions.sql.objectstore.Results;
import org.apache.isis.extensions.sql.objectstore.Sql;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMappingFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMappingFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMappingFactory.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcObjectReferenceMappingFactory.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.extensions.sql.objectstore.mapping.ObjectReferenceMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.ObjectReferenceMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimeMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimeMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimeMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimeMapper.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimestampMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimestampMapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimestampMapper.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/jdbc/JdbcTimestampMapper.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.extensions.sql.objectstore.jdbc;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMapping;
import org.apache.isis.extensions.sql.objectstore.mapping.FieldMappingFactory;
Modified: incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/mapping/FieldMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/mapping/FieldMapping.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/mapping/FieldMapping.java (original)
+++ incubator/isis/trunk/alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/mapping/FieldMapping.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.extensions.sql.objectstore.mapping;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.extensions.sql.objectstore.Results;