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 [19/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...
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestSpecification.java Mon Nov 8 11:23:08 2010
@@ -29,26 +29,26 @@ import org.apache.isis.core.commons.debu
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.commons.filters.Filter;
-import org.apache.isis.metamodel.adapter.Instance;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
-import org.apache.isis.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.adapter.Instance;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.consent.InteractionResult;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.Persistability;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+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.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.core.metamodel.testspec.TestProxySpecification;
import org.apache.isis.metamodel.facets.FacetHolderNoop;
import org.apache.isis.metamodel.interactions.ObjectTitleContext;
import org.apache.isis.metamodel.interactions.ObjectValidityContext;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
import org.apache.isis.metamodel.runtimecontext.noruntime.RuntimeContextNoRuntime;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.Persistability;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-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.spec.feature.OneToManyAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.metamodel.testspec.TestProxySpecification;
/**
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreatePersistentObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreatePersistentObjectsTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreatePersistentObjectsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreatePersistentObjectsTest.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.runtime.testsystem.tests;
-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.testsystem.ProxyJunit3TestCase;
import org.apache.isis.runtime.testsystem.TestPojo;
import org.apache.isis.runtime.testsystem.TestProxyOid;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreateTransientObjectsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreateTransientObjectsTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreateTransientObjectsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/CreateTransientObjectsTest.java Mon Nov 8 11:23:08 2010
@@ -29,9 +29,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.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.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/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyConfigurationTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyConfigurationTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/tests/TestProxyConfigurationTest.java Mon Nov 8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.testsyst
import junit.framework.TestCase;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.testsystem.TestProxyConfiguration;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/ConfigurationBuilderServletContext.java Mon Nov 8 11:23:08 2010
@@ -24,9 +24,9 @@ import javax.servlet.ServletContext;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderResourceStreams;
-import org.apache.isis.metamodel.config.ConfigurationBuilderFileSystem;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderResourceStreams;
/**
* Convenience implementation of {@link ConfigurationBuilder} that
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisSessionFilter.java Mon Nov 8 11:23:08 2010
@@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.webapp.auth.AuthenticationSessionLookupStrategy;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisWebAppBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisWebAppBootstrapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisWebAppBootstrapper.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/IsisWebAppBootstrapper.java Mon Nov 8 11:23:08 2010
@@ -28,10 +28,10 @@ import javax.servlet.ServletContextListe
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationBuilderResourceStreams;
-import org.apache.isis.metamodel.config.ConfigurationPrimer;
-import org.apache.isis.metamodel.config.NotFoundPolicy;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilderResourceStreams;
+import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
+import org.apache.isis.core.metamodel.config.NotFoundPolicy;
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/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/WebAppConstants.java Mon Nov 8 11:23:08 2010
@@ -23,8 +23,8 @@ package org.apache.isis.webapp;
import javax.servlet.ServletContext;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.config.ConfigurationPrimer;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategy.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategy.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategy.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.webapp.auth;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.webapp.IsisSessionFilter;
/**
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategyDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategyDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategyDefault.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/webapp/auth/AuthenticationSessionLookupStrategyDefault.java Mon Nov 8 11:23:08 2010
@@ -25,7 +25,7 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.authentication.AuthenticationManager;
import org.apache.isis.runtime.authentication.standard.exploration.AuthenticationRequestExploration;
import org.apache.isis.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerBootstrapper.java Mon Nov 8 11:23:08 2010
@@ -33,9 +33,9 @@ import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.lang.CastUtils;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
-import org.apache.isis.metamodel.config.ConfigurationPrimer;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.runner.IsisBootstrapper;
import org.apache.isis.runtime.runner.IsisRunner;
import org.apache.isis.webapp.WebAppConstants;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/WebServerConstants.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.webserver;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerAddress.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerAddress.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerAddress.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerAddress.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import org.apache.commons.cli.CommandLin
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
import org.apache.isis.webserver.WebServerConstants;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerPort.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerPort.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerPort.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerPort.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import org.apache.commons.cli.CommandLin
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
import org.apache.isis.webserver.WebServerConstants;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerResourceBase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerResourceBase.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerResourceBase.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/webserver/internal/OptionHandlerResourceBase.java Mon Nov 8 11:23:08 2010
@@ -24,7 +24,7 @@ import org.apache.commons.cli.CommandLin
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
-import org.apache.isis.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.runtime.runner.BootPrinter;
import org.apache.isis.runtime.runner.options.OptionHandler;
import org.apache.isis.webserver.WebServerConstants;
Modified: incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/persistence/objectfactory/internal/ObjectResolveAndObjectChangedEnhancer.java Mon Nov 8 11:23:08 2010
@@ -30,11 +30,11 @@ import net.sf.cglib.proxy.MethodIntercep
import net.sf.cglib.proxy.MethodProxy;
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/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java (original)
+++ incubator/isis/trunk/defaults/bytecode/src/main/java/org/apache/isis/bytecode/cglib/specloader/classsubstitutor/CglibClassSubstitutor.java Mon Nov 8 11:23:08 2010
@@ -21,8 +21,8 @@
package org.apache.isis.bytecode.cglib.specloader.classsubstitutor;
import org.apache.isis.bytecode.cglib.persistence.objectfactory.internal.CglibEnhanced;
+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 CglibClassSubstitutor extends ClassSubstitutorAbstract {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java Mon Nov 8 11:23:08 2010
@@ -28,14 +28,14 @@ import java.util.Vector;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.debug.Debug;
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.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.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.util.CollectionFacetUtils;
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.metamodel.util.CollectionFacetUtils;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryPersistenceMechanismInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.objectstore.inmemory;
-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.adapterfactory.AdapterFactory;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances.java Mon Nov 8 11:23:08 2010
@@ -31,12 +31,12 @@ import java.util.Vector;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.core.commons.debug.DebugString;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.SerialNumberVersion;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-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.adapter.version.SerialNumberVersion;
+import org.apache.isis.core.metamodel.adapter.version.Version;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryObjectStore;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjects.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.runtime.objectstore.inmemory.internal;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
/**
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault.java Mon Nov 8 11:23:08 2010
@@ -24,8 +24,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
/**
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java Mon Nov 8 11:23:08 2010
@@ -21,8 +21,8 @@
package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
import org.apache.log4j.Logger;
-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.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.objectstore.inmemory.internal.commands;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/fixture/ObjectFixtureServiceTest.java Mon Nov 8 11:23:08 2010
@@ -29,7 +29,7 @@ import java.util.Set;
import junit.framework.Assert;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.runtime.testdomain.Movie;
import org.apache.isis.runtime.testdomain.Person;
import org.apache.isis.runtime.testdomain.Role;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/AbstractInMemoryObjectStoreTest.java Mon Nov 8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.runtime.objectst
import java.util.Collections;
-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.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_debug.java Mon Nov 8 11:23:08 2010
@@ -23,7 +23,7 @@ package org.apache.isis.runtime.objectst
import java.util.Collections;
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.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_interactionWithAdapterManager.java Mon Nov 8 11:23:08 2010
@@ -20,8 +20,8 @@
package org.apache.isis.runtime.objectstore.inmemory;
-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.persistence.ObjectNotFoundException;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.runtime.testsystem.ProxyJunit3TestCase;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_persist.java Mon Nov 8 11:23:08 2010
@@ -22,8 +22,8 @@ package org.apache.isis.runtime.objectst
import java.util.Collections;
-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.persistence.objectstore.transaction.PersistenceCommand;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
import org.apache.isis.runtime.testsystem.TestProxyAdapter;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_reset.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.objectstore.inmemory;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class InMemoryObjectStore_reset extends AbstractInMemoryObjectStoreTest {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_retrieve.java Mon Nov 8 11:23:08 2010
@@ -20,9 +20,9 @@
package org.apache.isis.runtime.objectstore.inmemory;
-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.persistence.ObjectNotFoundException;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.runtime.persistence.query.PersistenceQueryFindByTitle;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore_serviceRegistry.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.objectstore.inmemory;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.runtime.testsystem.TestProxyOid;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_findInstancesAndAdd.java Mon Nov 8 11:23:08 2010
@@ -30,9 +30,9 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+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.runtime.persistence.query.PersistenceQueryBuiltIn;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_init.java Mon Nov 8 11:23:08 2010
@@ -32,8 +32,8 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
/**
* Tested in style of <i>Working Effectively with Legacy Code</i> (Feathers)
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStoreInstances_save.java Mon Nov 8 11:23:08 2010
@@ -33,11 +33,11 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.Oid;
-import org.apache.isis.metamodel.adapter.version.Version;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
-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.adapter.version.Version;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
/**
* Tested in style of <i>Working Effectively with Legacy Code</i> (Feathers)
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_instances.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@RunWith(JMock.class)
public class ObjectStorePersistedObjectsDefault_instances {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/objectstore/inmemory/internal/ObjectStorePersistedObjectsDefault_services.java Mon Nov 8 11:23:08 2010
@@ -30,7 +30,7 @@ import org.jmock.integration.junit4.JUni
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
@RunWith(JMock.class)
public class ObjectStorePersistedObjectsDefault_services {
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java Mon Nov 8 11:23:08 2010
@@ -27,7 +27,7 @@ import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
import org.apache.isis.metamodel.specloader.ObjectReflectorAbstract;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.authentication.AuthenticationManager;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/metamodel/specloader/JavaReflector.java Mon Nov 8 11:23:08 2010
@@ -23,11 +23,11 @@ package org.apache.isis.metamodel.speclo
import java.util.Set;
import org.apache.log4j.Logger;
-import org.apache.isis.metamodel.adapter.ObjectList;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.adapter.ObjectList;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.JavaSpecification;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry;
import org.apache.isis.metamodel.specloader.internal.instances.InstanceCollectionSpecification;
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/runtime/system/installers/JavaReflectorInstaller.java Mon Nov 8 11:23:08 2010
@@ -27,9 +27,9 @@ import java.util.Set;
import org.apache.log4j.Logger;
import org.apache.isis.core.commons.factory.InstanceFactory;
-import org.apache.isis.metamodel.config.ConfigurationConstants;
-import org.apache.isis.metamodel.config.IsisConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+import org.apache.isis.core.metamodel.config.ConfigurationConstants;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.specloader.FacetDecoratorInstaller;
import org.apache.isis.metamodel.specloader.JavaReflector;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Mon Nov 8 11:23:08 2010
@@ -23,15 +23,15 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
-import org.apache.isis.metamodel.config.internal.PropertiesConfiguration;
-import org.apache.isis.metamodel.facetdecorator.FacetDecorator;
+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.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.metamodel.facets.naming.describedas.DescribedAsFacet;
import org.apache.isis.metamodel.facets.naming.named.NamedFacet;
import org.apache.isis.metamodel.facets.object.ident.plural.PluralFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistryDefault;
import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
import org.apache.isis.metamodel.specloader.traverser.SpecificationTraverserDefault;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ArrayTest.java Mon Nov 8 11:23:08 2010
@@ -22,10 +22,10 @@ package org.apache.isis.metamodel.speclo
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.Facet;
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.specloader.JavaReflector;
import org.apache.isis.runtime.testsystem.TestPojo;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_CollectionTest.java Mon Nov 8 11:23:08 2010
@@ -24,10 +24,10 @@ import java.util.Vector;
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.Facet;
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.specloader.JavaReflector;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ObjectTest.java Mon Nov 8 11:23:08 2010
@@ -22,6 +22,7 @@ package org.apache.isis.metamodel.speclo
import org.junit.Assert;
import org.junit.Test;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet;
import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet;
@@ -31,7 +32,6 @@ import org.apache.isis.metamodel.facets.
import org.apache.isis.metamodel.facets.object.ident.title.TitleFacet;
import org.apache.isis.metamodel.facets.object.notpersistable.NotPersistableFacet;
import org.apache.isis.metamodel.facets.object.validprops.ObjectValidPropertiesFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.JavaReflector;
import org.apache.isis.runtime.system.TestDomainObject;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ValueTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ValueTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ValueTest.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflector_ValueTest.java Mon Nov 8 11:23:08 2010
@@ -22,7 +22,7 @@ package org.apache.isis.metamodel.speclo
import org.junit.Assert;
import org.junit.Test;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.specloader.JavaReflector;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/AuthenticatorNoop.java Mon Nov 8 11:23:08 2010
@@ -21,7 +21,7 @@
package org.apache.isis.runtime.authentication.standard.noop;
import org.apache.isis.core.commons.components.Noop;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.AuthenticationRequest;
import org.apache.isis.runtime.authentication.standard.AuthenticatorAbstract;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authentication/standard/noop/NoopAuthenticationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authentication.standard.noop;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.standard.Authenticator;
import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
Modified: incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java (original)
+++ incubator/isis/trunk/defaults/security/src/main/java/org/apache/isis/runtime/authorization/standard/noop/NoopAuthorizationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.authorization.standard.noop;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authorization.standard.AuthorizationManagerStandardInstallerAbstract;
import org.apache.isis.runtime.authorization.standard.Authorizor;
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/main/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactory.java Mon Nov 8 11:23:08 2010
@@ -23,12 +23,12 @@ package org.apache.isis.metamodel.exampl
import java.io.IOException;
import java.lang.reflect.Method;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import org.apache.isis.metamodel.facets.FacetFactory;
import org.apache.isis.metamodel.facets.FacetHolder;
import org.apache.isis.metamodel.facets.FacetUtil;
import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
-import org.apache.isis.metamodel.spec.identifier.Identified;
public class NameFileFacetFactory implements FacetFactory {
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryFeatureTypesTest.java Mon Nov 8 11:23:08 2010
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTha
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
import org.apache.isis.metamodel.examples.facets.namefile.NameFileFacetFactory;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
Modified: incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java (original)
+++ incubator/isis/trunk/examples/metamodel-examples/namefile/src/test/java/org/apache/isis/metamodel/examples/facets/namefile/NameFileFacetFactoryProcessTest.java Mon Nov 8 11:23:08 2010
@@ -32,12 +32,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.applib.Identifier;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
import static org.apache.isis.core.commons.matchers.NofMatchers.anInstanceOf;
import org.apache.isis.metamodel.facets.Facet;
import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.identifier.Identified;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/AliasRegistry.java Mon Nov 8 11:23:08 2010
@@ -1,6 +1,6 @@
package org.apache.isis.viewer.bdd.common;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public interface AliasRegistry {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java Mon Nov 8 11:23:08 2010
@@ -6,8 +6,8 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.isis.applib.fixtures.LogonFixture;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.adapter.oid.AggregatedOid;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.AggregatedOid;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.installers.InstallerLookup;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryAuthenticationManagerInstaller.java Mon Nov 8 11:23:08 2010
@@ -1,6 +1,6 @@
package org.apache.isis.viewer.bdd.common.components;
-import org.apache.isis.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandardInstallerAbstract;
import org.apache.isis.runtime.authentication.standard.Authenticator;
import org.apache.isis.runtime.authentication.standard.noop.AuthenticatorNoop;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryInMemoryPersistenceSessionFactory.java Mon Nov 8 11:23:08 2010
@@ -1,7 +1,7 @@
package org.apache.isis.viewer.bdd.common.components;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.object.cached.CachedFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceSessionFactory;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.PersistenceSessionFactoryDelegate;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/StoryObjectStorePersistedObjects.java Mon Nov 8 11:23:08 2010
@@ -4,9 +4,9 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.isis.core.commons.exceptions.IsisException;
-import org.apache.isis.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.facets.object.cached.CachedFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.oidgenerator.simple.SimpleOidGenerator.Memento;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Mon Nov 8 11:23:08 2010
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.bdd.commo
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AliasItemsInListPeer.java Mon Nov 8 11:23:08 2010
@@ -1,8 +1,8 @@
package org.apache.isis.viewer.bdd.common.fixtures;
-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.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/CheckListPeer.java Mon Nov 8 11:23:08 2010
@@ -3,9 +3,9 @@ package org.apache.isis.viewer.bdd.commo
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.metamodel.facets.collections.modify.CollectionFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryValueException;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/SetUpObjectsPeer.java Mon Nov 8 11:23:08 2010
@@ -4,13 +4,13 @@ import java.util.ArrayList;
import java.util.List;
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.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
import org.apache.isis.metamodel.facets.properties.modify.PropertySetterFacet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/UsingNakedObjectsViewerPeer.java Mon Nov 8 11:23:08 2010
@@ -6,14 +6,14 @@ import java.util.List;
import java.util.Map;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
-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.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.ObjectMember;
import org.apache.isis.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.metamodel.runtimecontext.spec.feature.ObjectActionSet;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-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.ObjectMember;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/AddToCollection.java Mon Nov 8 11:23:08 2010
@@ -1,11 +1,11 @@
package org.apache.isis.viewer.bdd.common.fixtures.perform;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.consent.Consent;
-import org.apache.isis.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.consent.InteractionInvocationMethod;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.metamodel.facets.collections.modify.CollectionAddToFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
import org.apache.isis.viewer.bdd.common.StoryCell;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/ClearProperty.java Mon Nov 8 11:23:08 2010
@@ -1,10 +1,10 @@
package org.apache.isis.viewer.bdd.common.fixtures.perform;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.facets.properties.modify.PropertyClearFacet;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java?rev=1032543&r1=1032542&r2=1032543&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/perform/GetActionParameterChoices.java Mon Nov 8 11:23:08 2010
@@ -1,8 +1,8 @@
package org.apache.isis.viewer.bdd.common.fixtures.perform;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.bdd.common.CellBinding;
import org.apache.isis.viewer.bdd.common.StoryBoundValueException;
import org.apache.isis.viewer.bdd.common.StoryCell;