Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 42828 invoked from network); 8 Nov 2010 11:26:24 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Nov 2010 11:26:24 -0000 Received: (qmail 9743 invoked by uid 500); 8 Nov 2010 11:26:56 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 9729 invoked by uid 500); 8 Nov 2010 11:26:56 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 9722 invoked by uid 99); 8 Nov 2010 11:26:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Nov 2010 11:26:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED,FSL_RU_URL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Nov 2010 11:26:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03CE12388C6A; Mon, 8 Nov 2010 11:24:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1032543 [16/26] - in /incubator/isis/trunk: alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassist/persistence/objectfactory/internal/ alternatives/bytecode/javassist/src/main/java/org/apache/isis/bytecode/javassi... Date: Mon, 08 Nov 2010 11:23:54 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101108112445.03CE12388C6A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/Logger.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/Logger.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/Logger.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/logging/Logger.java Mon Nov 8 11:23:08 2010 @@ -22,7 +22,7 @@ package org.apache.isis.runtime.logging; import org.apache.log4j.Level; -import org.apache.isis.metamodel.config.ConfigurationConstants; +import org.apache.isis.core.metamodel.config.ConfigurationConstants; public abstract class Logger { public static final String PROPERTY_ROOT = ConfigurationConstants.ROOT + "logging."; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/CollectionData.java Mon Nov 8 11:23:08 2010 @@ -23,11 +23,11 @@ package org.apache.isis.runtime.memento; import java.io.IOException; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.metamodel.adapter.ResolveState; -import org.apache.isis.metamodel.adapter.oid.Oid; -import org.apache.isis.metamodel.encoding.DataInputExtended; -import org.apache.isis.metamodel.encoding.DataInputStreamExtended; -import org.apache.isis.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.encoding.DataInputExtended; +import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputExtended; class CollectionData extends Data { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Data.java Mon Nov 8 11:23:08 2010 @@ -24,12 +24,12 @@ import java.io.IOException; import java.io.Serializable; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.metamodel.adapter.ResolveState; -import org.apache.isis.metamodel.adapter.oid.Oid; -import org.apache.isis.metamodel.encoding.DataInputExtended; -import org.apache.isis.metamodel.encoding.DataInputStreamExtended; -import org.apache.isis.metamodel.encoding.DataOutputExtended; -import org.apache.isis.metamodel.encoding.Encodable; +import org.apache.isis.core.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.encoding.DataInputExtended; +import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.encoding.Encodable; class Data implements Encodable, Serializable { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Memento.java Mon Nov 8 11:23:08 2010 @@ -27,21 +27,21 @@ import java.util.List; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.commons.exceptions.UnknownTypeException; -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.encoding.DataInputStreamExtended; -import org.apache.isis.metamodel.encoding.DataOutputStreamExtended; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.encoding.DataInputStreamExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputStreamExtended; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; +import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; +import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; +import org.apache.isis.core.metamodel.util.CollectionFacetUtils; import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet; import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet; import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet; 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.OneToManyAssociation; -import org.apache.isis.metamodel.spec.feature.OneToOneAssociation; import org.apache.isis.metamodel.specloader.SpecificationLoader; -import org.apache.isis.metamodel.util.CollectionFacetUtils; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.PersistenceSessionHydrator; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/Null.java Mon Nov 8 11:23:08 2010 @@ -22,9 +22,9 @@ package org.apache.isis.runtime.memento; import java.io.Serializable; -import org.apache.isis.metamodel.encoding.DataInputExtended; -import org.apache.isis.metamodel.encoding.DataOutputExtended; -import org.apache.isis.metamodel.encoding.Encodable; +import org.apache.isis.core.metamodel.encoding.DataInputExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.encoding.Encodable; class Null implements Encodable, Serializable { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/ObjectData.java Mon Nov 8 11:23:08 2010 @@ -25,10 +25,10 @@ import java.util.HashMap; import java.util.Map; import org.apache.isis.core.commons.debug.DebugString; -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.metamodel.encoding.Encodable; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.encoding.DataInputExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.encoding.Encodable; class ObjectData extends Data { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/memento/StandaloneData.java Mon Nov 8 11:23:08 2010 @@ -25,11 +25,11 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.encoding.DataInputExtended; -import org.apache.isis.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.encoding.DataInputExtended; +import org.apache.isis.core.metamodel.encoding.DataOutputExtended; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.metamodel.facets.object.encodeable.EncodableFacet; -import org.apache.isis.metamodel.spec.ObjectSpecification; import org.apache.isis.runtime.context.IsisContext; public class StandaloneData extends Data { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerAdditionalProperty.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerAdditionalProperty.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerAdditionalProperty.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerAdditionalProperty.java Mon Nov 8 11:23:08 2010 @@ -28,7 +28,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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConfiguration.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConfiguration.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConfiguration.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConfiguration.java Mon Nov 8 11:23:08 2010 @@ -24,8 +24,8 @@ import org.apache.commons.cli.CommandLin import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; -import org.apache.isis.metamodel.config.ConfigurationBuilder; -import org.apache.isis.metamodel.config.NotFoundPolicy; +import org.apache.isis.core.metamodel.config.ConfigurationBuilder; +import org.apache.isis.core.metamodel.config.NotFoundPolicy; import org.apache.isis.runtime.runner.BootPrinter; import org.apache.isis.runtime.runner.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConnector.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConnector.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConnector.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerConnector.java Mon Nov 8 11:23:08 2010 @@ -30,7 +30,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.isis.core.commons.lang.ListUtils; -import org.apache.isis.metamodel.config.ConfigurationBuilder; +import org.apache.isis.core.metamodel.config.ConfigurationBuilder; import org.apache.isis.runtime.installers.InstallerRepository; import org.apache.isis.runtime.runner.BootPrinter; import org.apache.isis.runtime.runner.Constants; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDebug.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDebug.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDebug.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDebug.java Mon Nov 8 11:23:08 2010 @@ -22,7 +22,7 @@ package org.apache.isis.runtime.options. import org.apache.commons.cli.CommandLine; 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.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDeploymentType.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDeploymentType.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDeploymentType.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDeploymentType.java Mon Nov 8 11:23:08 2010 @@ -24,8 +24,8 @@ import org.apache.commons.cli.CommandLin import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; -import org.apache.isis.metamodel.config.ConfigurationBuilder; -import org.apache.isis.metamodel.config.NotFoundPolicy; +import org.apache.isis.core.metamodel.config.ConfigurationBuilder; +import org.apache.isis.core.metamodel.config.NotFoundPolicy; import org.apache.isis.runtime.runner.BootPrinter; import org.apache.isis.runtime.runner.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDiagnostics.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDiagnostics.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDiagnostics.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerDiagnostics.java Mon Nov 8 11:23:08 2010 @@ -24,7 +24,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerFixture.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerFixture.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerFixture.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerFixture.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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerHelp.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerHelp.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerHelp.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerHelp.java Mon Nov 8 11:23:08 2010 @@ -25,7 +25,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerNoSplash.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerNoSplash.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerNoSplash.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerNoSplash.java Mon Nov 8 11:23:08 2010 @@ -25,7 +25,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.OptionHandlerAbstract; import org.apache.isis.runtime.system.SystemConstants; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPassword.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPassword.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPassword.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPassword.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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPersistor.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPersistor.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPersistor.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerPersistor.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.installers.InstallerRepository; import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller; import org.apache.isis.runtime.runner.BootPrinter; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerQuiet.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerQuiet.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerQuiet.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerQuiet.java Mon Nov 8 11:23:08 2010 @@ -24,7 +24,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerReflector.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.metamodel.specloader.ObjectReflectorInstaller; import org.apache.isis.runtime.installers.InstallerRepository; import org.apache.isis.runtime.runner.BootPrinter; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUser.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUser.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUser.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUser.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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUserProfileStore.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUserProfileStore.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUserProfileStore.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerUserProfileStore.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.installers.InstallerRepository; import org.apache.isis.runtime.runner.BootPrinter; import org.apache.isis.runtime.runner.Constants; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVerbose.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVerbose.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVerbose.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVerbose.java Mon Nov 8 11:23:08 2010 @@ -24,7 +24,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.OptionHandlerAbstract; import org.apache.isis.runtime.system.SystemConstants; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVersion.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVersion.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVersion.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerVersion.java Mon Nov 8 11:23:08 2010 @@ -24,7 +24,7 @@ import static org.apache.isis.runtime.ru import org.apache.commons.cli.CommandLine; 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.Constants; import org.apache.isis.runtime.runner.options.OptionHandlerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerViewer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerViewer.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerViewer.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/options/standard/OptionHandlerViewer.java Mon Nov 8 11:23:08 2010 @@ -30,7 +30,7 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.isis.core.commons.lang.ListUtils; -import org.apache.isis.metamodel.config.ConfigurationBuilder; +import org.apache.isis.core.metamodel.config.ConfigurationBuilder; import org.apache.isis.runtime.installers.InstallerRepository; import org.apache.isis.runtime.runner.BootPrinter; import org.apache.isis.runtime.runner.Constants; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ConcurrencyException.java Mon Nov 8 11:23:08 2010 @@ -22,9 +22,9 @@ package org.apache.isis.runtime.persiste import java.text.DateFormat; -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.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.runtime.transaction.ObjectPersistenceException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/ObjectNotFoundException.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.runtime.transaction.ObjectPersistenceException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceConstants.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence; import org.apache.isis.applib.DomainObjectContainer; -import org.apache.isis.metamodel.config.ConfigurationConstants; -import org.apache.isis.metamodel.config.IsisConfiguration; +import org.apache.isis.core.metamodel.config.ConfigurationConstants; +import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.metamodel.services.ServicesInjectorDefault; import org.apache.isis.metamodel.services.container.DomainObjectContainerDefault; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceMechanismInstallerAbstract.java Mon Nov 8 11:23:08 2010 @@ -30,7 +30,7 @@ import java.util.Properties; import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.core.commons.factory.InstanceFactory; -import org.apache.isis.metamodel.config.IsisConfiguration; +import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.metamodel.runtimecontext.RuntimeContext; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.runtime.installers.InstallerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAbstract.java Mon Nov 8 11:23:08 2010 @@ -35,20 +35,20 @@ import org.apache.log4j.Logger; import org.apache.isis.applib.query.Query; import org.apache.isis.applib.query.QueryDefault; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.ObjectList; -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.ObjectList; +import org.apache.isis.core.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.spec.Dirtiable; +import org.apache.isis.core.metamodel.spec.IntrospectableSpecification; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.metamodel.spec.SpecificationFacets; +import org.apache.isis.core.metamodel.spec.ObjectSpecification.CreationMode; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.metamodel.services.container.query.QueryCardinality; import org.apache.isis.metamodel.services.container.query.QueryFindAllInstances; import org.apache.isis.metamodel.services.container.query.QueryFindByPattern; import org.apache.isis.metamodel.services.container.query.QueryFindByTitle; -import org.apache.isis.metamodel.spec.Dirtiable; -import org.apache.isis.metamodel.spec.IntrospectableSpecification; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.SpecificationFacets; -import org.apache.isis.metamodel.spec.ObjectSpecification.CreationMode; import org.apache.isis.metamodel.specloader.SpecificationLoader; import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerExtended; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionAdaptedServiceManager.java Mon Nov 8 11:23:08 2010 @@ -22,7 +22,7 @@ package org.apache.isis.runtime.persiste import java.util.List; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; public interface PersistenceSessionAdaptedServiceManager { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionContainer.java Mon Nov 8 11:23:08 2010 @@ -21,12 +21,12 @@ package org.apache.isis.runtime.persiste import org.apache.isis.applib.DomainObjectContainer; import org.apache.isis.applib.query.Query; -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.ObjectSpecification; +import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.metamodel.services.container.query.QueryCardinality; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.runtime.persistence.query.PersistenceQuery; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionForceReloader.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; public interface PersistenceSessionForceReloader { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionHydrator.java Mon Nov 8 11:23:08 2010 @@ -21,10 +21,10 @@ package org.apache.isis.runtime.persistence; import org.apache.isis.core.commons.components.Injectable; -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.spec.ObjectSpecification; +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.ObjectSpecification; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; import org.apache.isis.runtime.persistence.objectfactory.ObjectFactory; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionLogger.java Mon Nov 8 11:23:08 2010 @@ -25,12 +25,12 @@ import java.util.List; import org.apache.isis.applib.query.Query; import org.apache.isis.core.commons.debug.DebugInfo; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +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.metamodel.services.ServicesInjector; import org.apache.isis.metamodel.services.container.query.QueryCardinality; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.metamodel.specloader.SpecificationLoader; import org.apache.isis.runtime.logging.Logger; import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistenceSessionTransactionManagement.java Mon Nov 8 11:23:08 2010 @@ -20,9 +20,9 @@ package org.apache.isis.runtime.persistence; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; -import org.apache.isis.metamodel.spec.Dirtiable; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.spec.Dirtiable; import org.apache.isis.runtime.transaction.IsisTransactionManager; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/PersistorUtil.java Mon Nov 8 11:23:08 2010 @@ -22,8 +22,8 @@ package org.apache.isis.runtime.persiste import org.apache.log4j.Logger; import org.apache.isis.core.commons.ensure.Assert; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ResolveState; public class PersistorUtil { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactory.java Mon Nov 8 11:23:08 2010 @@ -22,8 +22,8 @@ package org.apache.isis.runtime.persiste import org.apache.isis.core.commons.components.Injectable; import org.apache.isis.core.commons.components.SessionScopedComponent; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/AdapterFactoryAbstract.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence.adapterfactory; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; public abstract class AdapterFactoryAbstract implements AdapterFactory { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapter.java Mon Nov 8 11:23:08 2010 @@ -28,17 +28,17 @@ import org.apache.isis.core.commons.ensu import org.apache.isis.core.commons.ensure.Ensure; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.metamodel.adapter.Instance; -import org.apache.isis.metamodel.adapter.InstanceAbstract; -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.Instance; +import org.apache.isis.core.metamodel.adapter.InstanceAbstract; +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.Specification; 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.Specification; import org.apache.isis.metamodel.specloader.SpecificationLoader; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.ConcurrencyException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterFactory.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterFactory.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterFactory.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence.adapterfactory.pojo; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactoryAbstract; public class PojoAdapterFactory extends AdapterFactoryAbstract { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManager.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManager.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManager.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManager.java Mon Nov 8 11:23:08 2010 @@ -21,12 +21,12 @@ package org.apache.isis.runtime.persistence.adaptermanager; import org.apache.isis.core.commons.components.Injectable; -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.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.identifier.Identified; +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.identifier.Identified; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerAbstract.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence.adaptermanager; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerBackdoor.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerBackdoor.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerBackdoor.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerBackdoor.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence.adaptermanager; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.runtime.persistence.PersistenceSessionHydrator; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerDefault.java Mon Nov 8 11:23:08 2010 @@ -30,20 +30,20 @@ import org.apache.isis.applib.Identifier import org.apache.isis.core.commons.debug.DebugInfo; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.ensure.Assert; -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.OneToManyAssociation; +import org.apache.isis.core.metamodel.spec.identifier.Identified; import org.apache.isis.metamodel.facets.actcoll.typeof.TypeOfFacet; import org.apache.isis.metamodel.facets.object.aggregated.AggregatedFacet; import org.apache.isis.metamodel.facets.object.value.ValueFacet; import org.apache.isis.metamodel.facets.propcoll.access.PropertyAccessorFacet; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.metamodel.services.ServicesInjectorAware; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.feature.OneToManyAssociation; -import org.apache.isis.metamodel.spec.identifier.Identified; import org.apache.isis.metamodel.specloader.SpecificationLoader; import org.apache.isis.metamodel.specloader.SpecificationLoaderAware; import org.apache.isis.runtime.persistence.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerExtended.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerExtended.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerExtended.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerExtended.java Mon Nov 8 11:23:08 2010 @@ -23,7 +23,7 @@ package org.apache.isis.runtime.persiste import org.apache.isis.core.commons.components.Resettable; import org.apache.isis.core.commons.components.SessionScopedComponent; import org.apache.isis.core.commons.debug.DebugInfo; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.runtime.persistence.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerLookup.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerLookup.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerLookup.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerLookup.java Mon Nov 8 11:23:08 2010 @@ -21,8 +21,8 @@ package org.apache.isis.runtime.persistence.adaptermanager; import org.apache.isis.core.commons.components.Injectable; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerPersist.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerPersist.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerPersist.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerPersist.java Mon Nov 8 11:23:08 2010 @@ -20,9 +20,9 @@ package org.apache.isis.runtime.persistence.adaptermanager; -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.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerProxy.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerProxy.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerProxy.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerProxy.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence.adaptermanager; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.runtime.persistence.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerTestSupport.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerTestSupport.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerTestSupport.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterManagerTestSupport.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence.adaptermanager; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; public interface AdapterManagerTestSupport { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AdapterUtils.java Mon Nov 8 11:23:08 2010 @@ -21,11 +21,11 @@ package org.apache.isis.runtime.persistence.adaptermanager; import org.apache.isis.core.commons.exceptions.UnknownTypeException; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.metamodel.util.CollectionFacetUtils; import org.apache.isis.metamodel.facets.collections.modify.CollectionFacet; -import org.apache.isis.metamodel.spec.ObjectSpecification; import org.apache.isis.metamodel.specloader.SpecificationLoader; -import org.apache.isis.metamodel.util.CollectionFacetUtils; public final class AdapterUtils { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AggregateAdapters.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AggregateAdapters.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AggregateAdapters.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/AggregateAdapters.java Mon Nov 8 11:23:08 2010 @@ -27,8 +27,8 @@ import java.util.Map; import java.util.Set; import org.apache.isis.core.commons.ensure.Assert; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.spec.feature.OneToManyAssociation; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; public class AggregateAdapters implements Iterable { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/ObjectToAdapterTransformer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/ObjectToAdapterTransformer.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/ObjectToAdapterTransformer.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/ObjectToAdapterTransformer.java Mon Nov 8 11:23:08 2010 @@ -21,7 +21,7 @@ package org.apache.isis.runtime.persistence.adaptermanager; import org.apache.commons.collections.Transformer; -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.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterHashMap.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterHashMap.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterHashMap.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterHashMap.java Mon Nov 8 11:23:08 2010 @@ -26,9 +26,9 @@ import java.util.Map; 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.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 class OidAdapterHashMap implements OidAdapterMap { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterMap.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterMap.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterMap.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/OidAdapterMap.java Mon Nov 8 11:23:08 2010 @@ -23,8 +23,8 @@ package org.apache.isis.runtime.persiste import org.apache.isis.core.commons.components.Resettable; import org.apache.isis.core.commons.components.SessionScopedComponent; import org.apache.isis.core.commons.debug.DebugInfo; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.oid.Oid; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterHashMap.java Mon Nov 8 11:23:08 2010 @@ -28,7 +28,7 @@ import org.apache.commons.collections.ma import org.apache.log4j.Logger; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; /** Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adaptermanager/internal/PojoAdapterMap.java Mon Nov 8 11:23:08 2010 @@ -23,7 +23,7 @@ package org.apache.isis.runtime.persiste import org.apache.isis.core.commons.components.Resettable; import org.apache.isis.core.commons.components.SessionScopedComponent; import org.apache.isis.core.commons.debug.DebugInfo; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; public interface PojoAdapterMap extends DebugInfo, Iterable, SessionScopedComponent, Resettable { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerObjectChanged.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence.container; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/container/DomainObjectContainerResolve.java Mon Nov 8 11:23:08 2010 @@ -20,8 +20,8 @@ package org.apache.isis.runtime.persistence.container; -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.metamodel.services.ServicesInjector; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.PersistenceSession; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/internal/RuntimeContextFromSession.java Mon Nov 8 11:23:08 2010 @@ -24,15 +24,15 @@ import java.util.List; import org.apache.isis.applib.ApplicationException; import org.apache.isis.applib.query.Query; -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.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.identifier.Identified; +import org.apache.isis.core.metamodel.util.CollectionFacetUtils; import org.apache.isis.metamodel.runtimecontext.ObjectInstantiationException; import org.apache.isis.metamodel.runtimecontext.RuntimeContextAbstract; import org.apache.isis.metamodel.services.container.query.QueryCardinality; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.identifier.Identified; -import org.apache.isis.metamodel.util.CollectionFacetUtils; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreDelegating.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreDelegating.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreDelegating.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreDelegating.java Mon Nov 8 11:23:08 2010 @@ -23,10 +23,10 @@ package org.apache.isis.runtime.persiste import java.util.List; 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.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.objectstore.transaction.CreateObjectCommand; import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand; import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreLogger.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreLogger.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreLogger.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/IsisStoreLogger.java Mon Nov 8 11:23:08 2010 @@ -24,11 +24,11 @@ import java.util.List; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.factory.InstanceCreationException; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.oid.Oid; -import org.apache.isis.metamodel.config.ConfigurationException; -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.config.ConfigurationException; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.runtime.logging.Logger; import org.apache.isis.runtime.persistence.ObjectNotFoundException; import org.apache.isis.runtime.persistence.UnsupportedFindException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistence.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistence.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistence.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistence.java Mon Nov 8 11:23:08 2010 @@ -24,10 +24,10 @@ import java.util.List; import org.apache.isis.core.commons.components.NamedComponent; import org.apache.isis.core.commons.components.SessionScopedComponent; import org.apache.isis.core.commons.debug.DebugInfo; -import org.apache.isis.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.ObjectNotFoundException; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStorePersistenceMechanismInstallerAbstract.java Mon Nov 8 11:23:08 2010 @@ -25,7 +25,7 @@ import static org.hamcrest.CoreMatchers. import static org.hamcrest.CoreMatchers.nullValue; import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg; -import org.apache.isis.metamodel.config.IsisConfiguration; +import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.metamodel.services.ServicesInjector; import org.apache.isis.runtime.logging.Logger; import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/PersistenceSessionObjectStore.java Mon Nov 8 11:23:08 2010 @@ -32,10 +32,13 @@ import java.util.Map; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.ensure.Assert; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.metamodel.adapter.ObjectAdapter; -import org.apache.isis.metamodel.adapter.ResolveState; -import org.apache.isis.metamodel.adapter.oid.Oid; -import org.apache.isis.metamodel.authentication.AuthenticationSession; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ResolveState; +import org.apache.isis.core.metamodel.adapter.oid.Oid; +import org.apache.isis.core.metamodel.authentication.AuthenticationSession; +import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; +import org.apache.isis.core.metamodel.util.CallbackUtils; import org.apache.isis.metamodel.facets.object.callbacks.LoadedCallbackFacet; import org.apache.isis.metamodel.facets.object.callbacks.LoadingCallbackFacet; import org.apache.isis.metamodel.facets.object.callbacks.RemovedCallbackFacet; @@ -43,9 +46,6 @@ import org.apache.isis.metamodel.facets. import org.apache.isis.metamodel.facets.object.callbacks.UpdatedCallbackFacet; import org.apache.isis.metamodel.facets.object.callbacks.UpdatingCallbackFacet; import org.apache.isis.metamodel.services.ServicesInjector; -import org.apache.isis.metamodel.spec.ObjectSpecification; -import org.apache.isis.metamodel.spec.feature.ObjectAssociation; -import org.apache.isis.metamodel.util.CallbackUtils; import org.apache.isis.runtime.context.IsisContext; import org.apache.isis.runtime.persistence.FixturesInstalledFlag; import org.apache.isis.runtime.persistence.NotPersistableException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithm.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithm.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithm.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithm.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence.objectstore.algorithm; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; public interface PersistAlgorithm { Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/PersistAlgorithmAbstract.java Mon Nov 8 11:23:08 2010 @@ -20,9 +20,9 @@ package org.apache.isis.runtime.persistence.objectstore.algorithm; -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.persistence.NotPersistableException; Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java?rev=1032543&r1=1032542&r2=1032543&view=diff ============================================================================== --- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java (original) +++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java Mon Nov 8 11:23:08 2010 @@ -20,7 +20,7 @@ package org.apache.isis.runtime.persistence.objectstore.algorithm; -import org.apache.isis.metamodel.adapter.ObjectAdapter; +import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.runtime.persistence.PersistenceSession;