Return-Path: X-Original-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 634DBD330 for ; Thu, 9 Aug 2012 23:18:08 +0000 (UTC) Received: (qmail 38563 invoked by uid 500); 9 Aug 2012 23:18:08 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 38543 invoked by uid 500); 9 Aug 2012 23:18:08 -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 38533 invoked by uid 99); 9 Aug 2012 23:18:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Aug 2012 23:18:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED 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; Thu, 09 Aug 2012 23:17:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 01B9A2388B1B; Thu, 9 Aug 2012 23:16:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1371529 [8/9] - in /incubator/isis/trunk/framework: core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/map/ core/metamodel/src/main/java/org/apache/isis/... Date: Thu, 09 Aug 2012 23:16:35 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120809231648.01B9A2388B1B@eris.apache.org> Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/userprofile/UserProfilesDebugUtil.java Thu Aug 9 23:16:27 2012 @@ -21,7 +21,7 @@ package org.apache.isis.runtimes.dflt.ru import org.apache.isis.core.commons.debug.DebugBuilder; import org.apache.isis.core.commons.debug.DebuggableWithTitle; -import org.apache.isis.core.metamodel.adapter.map.AdapterMap; +import org.apache.isis.core.metamodel.adapter.map.AdapterManager; import org.apache.isis.core.metamodel.services.ServiceUtil; import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.core.runtime.userprofile.UserProfile; @@ -74,7 +74,7 @@ public final class UserProfilesDebugUtil debug.blankLine(); debug.appendTitle("Objects"); debug.indent(); - final AdapterMap adapterMap = getAdapterMap(); + final AdapterManager adapterMap = getAdapterMap(); for (final Object obj : perspectiveEntry.getObjects()) { debug.appendln(adapterMap.adapterFor(obj).toString()); } @@ -92,7 +92,7 @@ public final class UserProfilesDebugUtil // Dependencies (from Context) // /////////////////////////////////////////////////////// - private static AdapterMap getAdapterMap() { + private static AdapterManager getAdapterMap() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/context/IsisContextTest.java Thu Aug 9 23:16:27 2012 @@ -33,8 +33,8 @@ import org.junit.Test; import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.config.IsisConfigurationDefault; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; -import org.apache.isis.core.metamodel.spec.SpecificationLoaderAware; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpiAware; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authentication.standard.SimpleSession; import org.apache.isis.core.runtime.authorization.AuthorizationManager; @@ -63,7 +63,7 @@ public class IsisContextTest { private PersistenceSession mockPersistenceSession; @Mock - private SpecificationLoader mockSpecificationLoader; + private SpecificationLoaderSpi mockSpecificationLoader; @Mock protected TemplateImageLoader mockTemplateImageLoader; Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/AdapterManagerDefault_aggregateAdapters.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/AdapterManagerDefault_aggregateAdapters.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/AdapterManagerDefault_aggregateAdapters.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/AdapterManagerDefault_aggregateAdapters.java Thu Aug 9 23:16:27 2012 @@ -42,8 +42,9 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault; import org.apache.isis.core.metamodel.adapter.oid.TypedOid; import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext; +import org.apache.isis.core.metamodel.runtimecontext.ServicesInjector; import org.apache.isis.core.metamodel.spec.ObjectSpecId; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.isis.core.progmodel.app.IsisMetaModel; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2; @@ -51,6 +52,7 @@ import org.apache.isis.core.testsupport. import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5; import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory; import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerDefault; +import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.PojoRecreatorDefault; import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.internal.OidAdapterHashMap; import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.internal.PojoAdapterHashMap; import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator; @@ -116,29 +118,35 @@ public class AdapterManagerDefault_aggre isisMetaModel = IsisMetaModel.builder(mockRuntimeContext, new ProgrammingModelFacetsJava5()).withServices(new CustomerRepository()).build(); isisMetaModel.init(); - adapterManager = new AdapterManagerDefault(); - adapterFactory = new PojoAdapterFactory() { @Override protected Localization getLocalization() { return mockLocalization; } @Override - protected SpecificationLoader getSpecificationLoader() { + protected SpecificationLoaderSpi getSpecificationLoader() { + return isisMetaModel.getSpecificationLoader(); + } + }; + + adapterManager = new AdapterManagerDefault(new PojoRecreatorDefault()) { + @Override + protected SpecificationLoaderSpi getSpecificationLoader() { return isisMetaModel.getSpecificationLoader(); } @Override - protected ObjectAdapterLookup getObjectAdapterLookup() { - return adapterManager; + protected ObjectAdapterFactory getObjectAdapterFactory() { + return adapterFactory; + } + @Override + public OidGenerator getOidGenerator() { + return mockOidGenerator; + } + @Override + protected ServicesInjector getServicesInjector() { + return isisMetaModel.getDependencyInjector(); } }; - - adapterManager.setPojoAdapterMap(new PojoAdapterHashMap()); - adapterManager.setOidAdapterMap(new OidAdapterHashMap()); - adapterManager.setAdapterFactory(adapterFactory); - adapterManager.setDependencyInjector(isisMetaModel.getDependencyInjector()); - adapterManager.setSpecificationLoader(isisMetaModel.getSpecificationLoader()); - adapterManager.setOidGenerator(mockOidGenerator); rootObject = new Customer(); aggregatedObject = new Name(); Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java Thu Aug 9 23:16:27 2012 @@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault; import org.apache.isis.core.metamodel.adapter.version.Version; import org.apache.isis.core.metamodel.spec.ObjectSpecId; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode; import org.apache.isis.runtimes.dflt.runtime.persistence.ConcurrencyException; @@ -56,7 +56,7 @@ public class PojoAdapterTest { @Mock private Version mockVersion2; @Mock - private SpecificationLoader mockSpecificationLoader; + private SpecificationLoaderSpi mockSpecificationLoader; @Mock private ObjectAdapterLookup mockObjectAdapterLookup; @Mock Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java Thu Aug 9 23:16:27 2012 @@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.runtimecontext.RuntimeContext; import org.apache.isis.core.metamodel.services.ServicesInjectorDefault; import org.apache.isis.core.metamodel.services.container.DomainObjectContainerDefault; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.progmodel.app.IsisMetaModel; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode; @@ -44,7 +45,7 @@ import org.apache.isis.progmodels.dflt.P import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.pojo.PojoAdapter; import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.pojo.PojoAdapterFactory; import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerDefault; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; +import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.PojoRecreatorDefault; import org.apache.isis.runtimes.dflt.runtime.persistence.internal.RuntimeContextFromSession; import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm.PersistAlgorithm; import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand; @@ -53,6 +54,7 @@ import org.apache.isis.runtimes.dflt.run import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PojoAdapterBuilder; import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence; import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.IdentifierGeneratorDefault; import org.apache.isis.runtimes.dflt.runtime.system.persistence.ObjectFactory; import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator; @@ -66,7 +68,7 @@ public class PersistenceSessionObjectSto public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES); private ServicesInjectorDefault servicesInjector; - private AdapterManagerExtended adapterManager; + private AdapterManagerSpi adapterManager; private ObjectAdapterFactory adapterFactory; @@ -80,7 +82,7 @@ public class PersistenceSessionObjectSto private PersistenceSessionFactory mockPersistenceSessionFactory; @Mock - private ObjectStore mockObjectStore; + private ObjectStoreSpi mockObjectStore; @Mock private ObjectFactory objectFactory; @Mock @@ -143,15 +145,19 @@ public class PersistenceSessionObjectSto servicesInjector = new ServicesInjectorDefault(); servicesInjector.setContainer(container); - adapterManager = new AdapterManagerDefault(); + adapterManager = new AdapterManagerDefault(new PojoRecreatorDefault()); adapterFactory = new PojoAdapterFactory(); - persistenceSession = new PersistenceSession(mockPersistenceSessionFactory, adapterFactory, objectFactory, servicesInjector, new OidGenerator(new IdentifierGeneratorDefault()), adapterManager, mockPersistAlgorithm, mockObjectStore); + persistenceSession = new PersistenceSession(mockPersistenceSessionFactory, adapterFactory, objectFactory, servicesInjector, new OidGenerator(new IdentifierGeneratorDefault()), adapterManager, mockPersistAlgorithm, mockObjectStore) { + @Override + protected SpecificationLoaderSpi getSpecificationLoader() { + return isisMetaModel.getSpecificationLoader(); + } + }; transactionManager = new IsisTransactionManager(persistenceSession, mockObjectStore); transactionManager.injectInto(persistenceSession); servicesInjector.setServices(Collections.emptyList()); - persistenceSession.setSpecificationLoader(isisMetaModel.getSpecificationLoader()); persistentAdapter = PojoAdapterBuilder.create().withOid("CUS|1").withPojo(new Customer()).with(Persistence.PERSISTENT).with(mockVersion).with(isisMetaModel.getSpecificationLoader()).build(); transientAdapter = PojoAdapterBuilder.create().withOid("CUS|2").withPojo(new Customer()).with(Persistence.TRANSIENT).with(isisMetaModel.getSpecificationLoader()).build(); Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManagerAbstractTestCase.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManagerAbstractTestCase.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManagerAbstractTestCase.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManagerAbstractTestCase.java Thu Aug 9 23:16:27 2012 @@ -25,7 +25,6 @@ import org.junit.Rule; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreTransactionManagement; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager; @@ -41,7 +40,7 @@ public abstract class ObjectStoreTransac @Mock protected PersistenceSession mockPersistenceSession; @Mock - protected ObjectStoreTransactionManagement mockObjectStore; + protected TransactionalResource mockObjectStore; // ////////////////////////////////////////////////// Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java Thu Aug 9 23:16:27 2012 @@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.version.Version; import org.apache.isis.core.metamodel.spec.ObjectSpecId; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.pojo.PojoAdapter; public class PojoAdapterBuilder { @@ -48,7 +48,7 @@ public class PojoAdapterBuilder { private ObjectSpecification objectSpec; // substitute the SpecLoader - private SpecificationLoader specificationLoader; + private SpecificationLoaderSpi specificationLoader; private ObjectAdapterLookup objectAdapterLookup; @@ -200,7 +200,7 @@ public class PojoAdapterBuilder { return this; } - public PojoAdapterBuilder with(SpecificationLoader specificationLoader) { + public PojoAdapterBuilder with(SpecificationLoaderSpi specificationLoader) { this.specificationLoader = specificationLoader; return this; } Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/TransactionTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/TransactionTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/TransactionTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/TransactionTest.java Thu Aug 9 23:16:27 2012 @@ -31,7 +31,7 @@ import org.apache.isis.core.commons.matc import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2; import org.apache.isis.core.testsupport.jmock.JUnitRuleMockery2.Mode; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore; +import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreSpi; import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager; @@ -53,7 +53,7 @@ public class TransactionTest { private ObjectAdapter persistentAdapter2; @Mock - private ObjectStore mockObjectStore; + private ObjectStoreSpi mockObjectStore; @Mock private IsisTransactionManager mockTransactionManager; Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectActionImplTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectActionImplTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectActionImplTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/ObjectActionImplTest.java Thu Aug 9 23:16:27 2012 @@ -32,11 +32,11 @@ import org.apache.isis.applib.Identifier import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.adapter.QuerySubmitter; import org.apache.isis.core.metamodel.adapter.ServicesProvider; -import org.apache.isis.core.metamodel.adapter.map.AdapterMap; +import org.apache.isis.core.metamodel.adapter.map.AdapterManager; import org.apache.isis.core.metamodel.facets.FacetedMethod; import org.apache.isis.core.metamodel.facets.named.NamedFacet; import org.apache.isis.core.metamodel.facets.named.NamedFacetAbstract; -import org.apache.isis.core.metamodel.spec.SpecificationLookup; +import org.apache.isis.core.metamodel.spec.SpecificationLoader; import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext; import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry; import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionImpl; @@ -57,9 +57,9 @@ public class ObjectActionImplTest { @Mock private AuthenticationSessionProvider mockAuthenticationSessionProvider; @Mock - private SpecificationLookup mockSpecificationLookup; + private SpecificationLoader mockSpecificationLookup; @Mock - private AdapterMap mockAdapterManager; + private AdapterManager mockAdapterManager; @Mock private ServicesProvider mockServicesProvider; @Mock Modified: incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/runtime/src/test/java/org/apache/isis/runtimes/dflt/runtime/system/OneToManyAssociationImplTest.java Thu Aug 9 23:16:27 2012 @@ -36,13 +36,13 @@ import org.apache.isis.applib.Identifier import org.apache.isis.core.commons.authentication.AuthenticationSessionProvider; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.QuerySubmitter; -import org.apache.isis.core.metamodel.adapter.map.AdapterMap; +import org.apache.isis.core.metamodel.adapter.map.AdapterManager; import org.apache.isis.core.metamodel.facets.FacetedMethod; import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet; import org.apache.isis.core.metamodel.facets.named.NamedFacet; import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLookup; +import org.apache.isis.core.metamodel.spec.SpecificationLoader; import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext; import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry; @@ -74,8 +74,8 @@ public class OneToManyAssociationImplTes private FacetedMethod mockPeer; private AuthenticationSessionProvider mockAuthenticationSessionProvider; - private SpecificationLookup mockSpecificationLookup; - private AdapterMap mockAdapterManager; + private SpecificationLoader mockSpecificationLookup; + private AdapterManager mockAdapterManager; private QuerySubmitter mockQuerySubmitter; private NamedFacet mockNamedFacet; @@ -89,8 +89,8 @@ public class OneToManyAssociationImplTes mockAssociatedAdapter = context.mock(ObjectAdapter.class, "associated"); mockAuthenticationSessionProvider = context.mock(AuthenticationSessionProvider.class); - mockSpecificationLookup = context.mock(SpecificationLookup.class); - mockAdapterManager = context.mock(AdapterMap.class); + mockSpecificationLookup = context.mock(SpecificationLoader.class); + mockAdapterManager = context.mock(AdapterManager.class); mockQuerySubmitter = context.mock(QuerySubmitter.class); mockCollectionTypeRegistry = context.mock(CollectionTypeRegistry.class); mockPeer = context.mock(FacetedMethod.class); Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemDefault.java Thu Aug 9 23:16:27 2012 @@ -14,7 +14,7 @@ import org.apache.isis.core.commons.reso import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator; import org.apache.isis.core.metamodel.layout.MemberLayoutArranger; import org.apache.isis.core.metamodel.progmodel.ProgrammingModel; -import org.apache.isis.core.metamodel.specloader.ObjectReflector; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.metamodel.specloader.ObjectReflectorDefault; import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor; import org.apache.isis.core.metamodel.specloader.collectiontyperegistry.CollectionTypeRegistry; @@ -119,7 +119,7 @@ public class IsisSystemDefault extends I * @see #obtainReflectorSpecificationTraverser() */ @Override - protected ObjectReflector obtainReflector(DeploymentType deploymentType) throws IsisSystemException { + protected SpecificationLoaderSpi obtainSpecificationLoaderSpi(DeploymentType deploymentType) throws IsisSystemException { ClassSubstitutor classSubstitutor = obtainReflectorClassSubstitutor(); CollectionTypeRegistry collectionTypeRegistry = obtainReflectorCollectionTypeRegistry(); SpecificationTraverser specificationTraverser = obtainReflectorSpecificationTraverser(); @@ -131,7 +131,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected ClassSubstitutor obtainReflectorClassSubstitutor() { @@ -139,7 +139,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected CollectionTypeRegistry obtainReflectorCollectionTypeRegistry() { @@ -147,7 +147,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected SpecificationTraverser obtainReflectorSpecificationTraverser() { @@ -155,7 +155,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected ProgrammingModel obtainReflectorProgrammingModel() { @@ -163,7 +163,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected Set obtainReflectorFacetDecoratorSet() { @@ -171,7 +171,7 @@ public class IsisSystemDefault extends I } /** - * Optional hook method, called from {@link #obtainReflector(DeploymentType)}. + * Optional hook method, called from {@link #obtainSpecificationLoaderSpi(DeploymentType)}. * @return */ protected MetaModelValidator obtainReflectorMetaModelValidator() { Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/IsisSystemWithFixtures.java Thu Aug 9 23:16:27 2012 @@ -44,11 +44,10 @@ import org.apache.isis.core.runtime.auth import org.apache.isis.core.runtime.authentication.AuthenticationRequest; import org.apache.isis.runtimes.dflt.objectstores.dflt.InMemoryPersistenceMechanismInstaller; import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerPersist; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore; +import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreSpi; import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransaction.State; @@ -524,7 +523,7 @@ public class IsisSystemWithFixtures impl } @SuppressWarnings("unchecked") - public T getObjectStore(Class cls) { + public T getObjectStore(Class cls) { final PersistenceSession persistenceSession = getPersistenceSession(); return (T) persistenceSession.getObjectStore(); } @@ -574,8 +573,8 @@ public class IsisSystemWithFixtures impl - private AdapterManagerPersist getAdapterManagerPersist() { - return (AdapterManagerPersist)getAdapterManager(); + private AdapterManagerSpi getAdapterManagerPersist() { + return getAdapterManager(); } public void beginTran() { @@ -654,7 +653,7 @@ public class IsisSystemWithFixtures impl return getPersistenceSession().getTransactionManager(); } - protected AdapterManagerExtended getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/tck/ObjectStoreContractTest_persist.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/tck/ObjectStoreContractTest_persist.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/tck/ObjectStoreContractTest_persist.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/main/java/org/apache/isis/runtimes/dflt/testsupport/tck/ObjectStoreContractTest_persist.java Thu Aug 9 23:16:27 2012 @@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.RootOid; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStore; +import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreSpi; import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQueryFindByTitle; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; @@ -67,9 +67,9 @@ public abstract class ObjectStoreContrac protected ObjectAdapter epv2Adapter; protected ObjectSpecification epvSpecification; - protected ObjectStore getStore() { + protected ObjectStoreSpi getStore() { PersistenceSession psos = IsisContext.getPersistenceSession(); - return (ObjectStore) psos.getObjectStore(); + return (ObjectStoreSpi) psos.getObjectStore(); } Modified: incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStoreTest_reset.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStoreTest_reset.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStoreTest_reset.java (original) +++ incubator/isis/trunk/framework/runtimes/dflt/testsupport/src/test/java/org/apache/isis/runtimes/dflt/objectstores/dflt/InMemoryObjectStoreTest_reset.java Thu Aug 9 23:16:27 2012 @@ -29,7 +29,7 @@ import org.junit.Test; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures; import org.apache.isis.tck.dom.refs.SimpleEntity; @@ -73,7 +73,7 @@ public class InMemoryObjectStoreTest_res return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java (original) +++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Scenario.java Thu Aug 9 23:16:27 2012 @@ -50,7 +50,7 @@ import org.apache.isis.runtimes.dflt.run import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; import org.apache.isis.runtimes.dflt.runtime.system.internal.InitialisationSession; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager; import org.apache.isis.viewer.bdd.common.components.BddAuthenticationManagerInstaller; @@ -298,7 +298,7 @@ public class Scenario implements AliasRe return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original) +++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Thu Aug 9 23:16:27 2012 @@ -22,10 +22,10 @@ import java.util.Arrays; import java.util.List; import org.apache.isis.core.commons.authentication.AuthenticationSession; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStorePersistence; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.ObjectStore; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager; import org.apache.isis.viewer.bdd.common.AliasRegistry; @@ -57,7 +57,7 @@ public abstract class AbstractFixturePee return IsisContext.getServices(); } - public SpecificationLoader getSpecificationLoader() { + public SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } @@ -69,11 +69,11 @@ public abstract class AbstractFixturePee return IsisContext.getPersistenceSession(); } - protected AdapterManager getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } - protected ObjectStorePersistence getObjectStore() { + protected ObjectStore getObjectStore() { return getPersistenceSession().getObjectStore(); } Modified: incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java (original) +++ incubator/isis/trunk/framework/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/DebugObjectStorePeer.java Thu Aug 9 23:16:27 2012 @@ -19,7 +19,7 @@ package org.apache.isis.viewer.bdd.common.fixtures; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStorePersistence; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.ObjectStore; import org.apache.isis.viewer.bdd.common.AliasRegistry; import org.apache.isis.viewer.bdd.common.CellBinding; @@ -30,7 +30,7 @@ public class DebugObjectStorePeer extend } public String debugObjectStore() { - final ObjectStorePersistence objectStore = getObjectStore(); + final ObjectStore objectStore = getObjectStore(); final DebugString debug = new DebugString(); objectStore.debugData(debug); return debug.toString().replaceAll("\n", "
"); Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java Thu Aug 9 23:16:27 2012 @@ -33,7 +33,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker; import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier; @@ -227,7 +227,7 @@ public class ViewUpdateNotifierImpl impl return IsisContext.getPersistenceSession(); } - private static AdapterManager getAdapterManager() { + private static AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/view/undo/SetValueCommand.java Thu Aug 9 23:16:27 2012 @@ -23,7 +23,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet; import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.dnd.view.Command; @@ -78,7 +78,7 @@ public class SetValueCommand implements return IsisContext.getPersistenceSession(); } - private static AdapterManager getAdapterManager() { + private static AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspace.java Thu Aug 9 23:16:27 2012 @@ -34,11 +34,11 @@ import org.apache.isis.core.metamodel.co import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.core.metamodel.spec.FreeStandingList; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.MultiUserExplorationSession; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.dnd.drawing.ColorsAndFonts; import org.apache.isis.viewer.dnd.drawing.Location; @@ -363,7 +363,7 @@ public final class ApplicationWorkspace final List servicePojos = IsisContext.getServices(); final List serviceAdapters = Lists.newArrayList(); for (final Object servicePojo : servicePojos) { - final AdapterManager adapterManager = IsisContext.getPersistenceSession().getAdapterManager(); + final AdapterManagerSpi adapterManager = IsisContext.getPersistenceSession().getAdapterManager(); serviceAdapters.add(adapterManager.adapterFor(servicePojo)); } final ObjectSpecification spec = getSpecificationLoader().loadSpecification(Object.class); @@ -499,7 +499,7 @@ public final class ApplicationWorkspace // Dependencies (from singleton) // ////////////////////////////////////////////////////////////////// - private SpecificationLoader getSpecificationLoader() { + private SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } @@ -507,7 +507,7 @@ public final class ApplicationWorkspace return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java Thu Aug 9 23:16:27 2012 @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.isis.core.commons.config.IsisConfigurationDefault; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; @@ -50,7 +50,7 @@ public class MultilineTextFieldContentTe private TextContent content; private final Mockery mockery = new JUnit4Mockery(); protected TemplateImageLoader mockTemplateImageLoader; - protected SpecificationLoader mockSpecificationLoader; + protected SpecificationLoaderSpi mockSpecificationLoader; protected PersistenceSessionFactory mockPersistenceSessionFactory; private UserProfileLoader mockUserProfileLoader; protected AuthenticationManager mockAuthenticationManager; @@ -65,7 +65,7 @@ public class MultilineTextFieldContentTe servicesList = Collections.emptyList(); mockTemplateImageLoader = mockery.mock(TemplateImageLoader.class); - mockSpecificationLoader = mockery.mock(SpecificationLoader.class); + mockSpecificationLoader = mockery.mock(SpecificationLoaderSpi.class); mockPersistenceSessionFactory = mockery.mock(PersistenceSessionFactory.class); mockUserProfileLoader = mockery.mock(UserProfileLoader.class); mockAuthenticationManager = mockery.mock(AuthenticationManager.class); Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java Thu Aug 9 23:16:27 2012 @@ -38,7 +38,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.isis.core.commons.config.IsisConfigurationDefault; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; @@ -63,7 +63,7 @@ public class TextFieldContentTest { @Mock protected TemplateImageLoader mockTemplateImageLoader; @Mock - protected SpecificationLoader mockSpecificationLoader; + protected SpecificationLoaderSpi mockSpecificationLoader; @Mock private UserProfileLoader mockUserProfileLoader; @Mock Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java Thu Aug 9 23:16:27 2012 @@ -39,7 +39,7 @@ import org.junit.Test; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java Thu Aug 9 23:16:27 2012 @@ -35,7 +35,7 @@ import org.junit.Test; import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.commons.config.IsisConfigurationDefault; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; @@ -64,7 +64,7 @@ public class ActionFieldBuilderTest { @Mock protected TemplateImageLoader mockTemplateImageLoader; @Mock - protected SpecificationLoader mockSpecificationLoader; + protected SpecificationLoaderSpi mockSpecificationLoader; @Mock protected PersistenceSessionFactory mockPersistenceSessionFactory; @Mock Modified: incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java (original) +++ incubator/isis/trunk/framework/viewer/dnd/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java Thu Aug 9 23:16:27 2012 @@ -34,7 +34,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.isis.core.commons.config.IsisConfigurationDefault; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.runtime.authentication.AuthenticationManager; import org.apache.isis.core.runtime.authorization.AuthorizationManager; import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; @@ -58,7 +58,7 @@ public class ScrollBorderTest { private final Mockery mockery = new JUnit4Mockery(); protected TemplateImageLoader mockTemplateImageLoader; - protected SpecificationLoader mockSpecificationLoader; + protected SpecificationLoaderSpi mockSpecificationLoader; protected PersistenceSessionFactory mockPersistenceSessionFactory; private UserProfileLoader mockUserProfileLoader; protected AuthenticationManager mockAuthenticationManager; @@ -73,7 +73,7 @@ public class ScrollBorderTest { servicesList = Collections.emptyList(); mockTemplateImageLoader = mockery.mock(TemplateImageLoader.class); - mockSpecificationLoader = mockery.mock(SpecificationLoader.class); + mockSpecificationLoader = mockery.mock(SpecificationLoaderSpi.class); mockUserProfileLoader = mockery.mock(UserProfileLoader.class); mockPersistenceSessionFactory = mockery.mock(PersistenceSessionFactory.class); mockAuthenticationManager = mockery.mock(AuthenticationManager.class); Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java Thu Aug 9 23:16:27 2012 @@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.fa import org.apache.isis.core.metamodel.facets.typeof.TypeOfFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; /** @@ -143,7 +143,7 @@ public class CollectionMapping implement // Dependencies (from context) // ////////////////////////////////////////////////////// - private static AdapterManager getAdapterManager() { + private static AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java Thu Aug 9 23:16:27 2012 @@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.runtime.userprofile.UserProfile; import org.apache.isis.runtimes.dflt.runtime.persistence.ConcurrencyException; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier; import org.apache.isis.viewer.html.component.Block; @@ -89,7 +89,7 @@ public class Context implements Serializ } public void init() { - final AdapterManager adapterManager = getAdapterManager(); + final AdapterManagerSpi adapterManager = getAdapterManager(); final List services = getUserProfile().getPerspective().getServices(); for (final Object service : services) { final ObjectAdapter serviceAdapter = adapterManager.adapterFor(service); @@ -636,7 +636,7 @@ public class Context implements Serializ return IsisContext.getUserProfile(); } - protected AdapterManager getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentRootAdapterMapping.java Thu Aug 9 23:16:27 2012 @@ -24,9 +24,8 @@ import org.apache.isis.core.commons.ensu import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault; import org.apache.isis.core.metamodel.adapter.version.Version; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; public class PersistentRootAdapterMapping extends RootAdapterMappingAbstract { @@ -113,7 +112,7 @@ public class PersistentRootAdapterMappin return IsisContext.getPersistenceSession(); } - protected AdapterManagerExtended getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java Thu Aug 9 23:16:27 2012 @@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.ut import org.apache.isis.core.runtime.userprofile.UserProfile; import org.apache.isis.runtimes.dflt.monitoring.servermonitor.Monitor; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfilesDebugUtil; import org.apache.isis.viewer.html.PathBuilder; import org.apache.isis.viewer.html.action.Action; @@ -335,7 +335,7 @@ public class WebController { private void listServices(final Context context, final Block navigationBar) { final Block taskBar = context.getComponentFactory().createBlock("services", null); taskBar.add(context.getComponentFactory().createHeading("Services")); - final AdapterManager adapterManager = IsisContext.getPersistenceSession().getAdapterManager(); + final AdapterManagerSpi adapterManager = IsisContext.getPersistenceSession().getAdapterManager(); final List services = getUserProfile().getPerspective().getServices(); for (final Object service : services) { final ObjectAdapter serviceAdapter = adapterManager.adapterFor(service); Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapAction.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapAction.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapAction.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapAction.java Thu Aug 9 23:16:27 2012 @@ -32,7 +32,7 @@ import org.junit.Test; import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures; import org.apache.isis.viewer.html.action.ActionException; @@ -91,7 +91,7 @@ public class ContextTest_mapAction { return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapCollection.java Thu Aug 9 23:16:27 2012 @@ -39,7 +39,7 @@ import org.junit.Test; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures; import org.apache.isis.tck.dom.refs.SimpleEntity; @@ -152,7 +152,7 @@ public class ContextTest_mapCollection { return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java (original) +++ incubator/isis/trunk/framework/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest_mapObject.java Thu Aug 9 23:16:27 2012 @@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.testsupport.IsisSystemWithFixtures; import org.apache.isis.viewer.html.action.ActionException; @@ -258,7 +258,7 @@ public class ContextTest_mapObject { return IsisContext.getPersistenceSession(); } - private AdapterManager getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java (original) +++ incubator/isis/trunk/framework/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java Thu Aug 9 23:16:27 2012 @@ -37,7 +37,7 @@ import org.apache.isis.applib.fixtures.L import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.config.IsisConfigurationBuilder; import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault; -import org.apache.isis.core.metamodel.services.ServicesInjector; +import org.apache.isis.core.metamodel.services.ServicesInjectorSpi; import org.apache.isis.core.runtime.authentication.AuthenticationRequest; import org.apache.isis.runtimes.dflt.runtime.authentication.exploration.AuthenticationRequestExploration; import org.apache.isis.runtimes.dflt.runtime.fixtures.authentication.AuthenticationRequestLogonFixture; @@ -118,7 +118,7 @@ public class IsisTestRunner extends JUni getTransactionManager().startTransaction(); final Object test = createTest(); - getServicesInjector().injectDependenciesInto(test); + getServicesInjector().injectServicesInto(test); final TestMethod testMethod = wrapMethod(method); new MethodRoadie(test, testMethod, notifier, description).run(); @@ -210,7 +210,7 @@ public class IsisTestRunner extends JUni return IsisContext.getPersistenceSession(); } - private static ServicesInjector getServicesInjector() { + private static ServicesInjectorSpi getServicesInjector() { return getPersistenceSession().getServicesInjector(); } Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/ResourceContext.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/ResourceContext.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/ResourceContext.java (original) +++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/ResourceContext.java Thu Aug 9 23:16:27 2012 @@ -39,7 +39,7 @@ import org.apache.isis.core.commons.auth import org.apache.isis.core.commons.config.IsisConfiguration; import org.apache.isis.core.metamodel.adapter.ObjectAdapterLookup; import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier; -import org.apache.isis.core.metamodel.spec.SpecificationLookup; +import org.apache.isis.core.metamodel.spec.SpecificationLoader; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation; import org.apache.isis.viewer.restfulobjects.applib.RepresentationType; @@ -61,7 +61,7 @@ public class ResourceContext { private final AuthenticationSession authenticationSession; private final PersistenceSession persistenceSession; private final ObjectAdapterLookup objectAdapterLookup; - private final SpecificationLookup specificationLookup; + private final SpecificationLoader specificationLookup; private List> followLinks; @@ -80,7 +80,7 @@ public class ResourceContext { private JsonRepresentation readQueryStringAsMap; public ResourceContext(final RepresentationType representationType, final HttpHeaders httpHeaders, final UriInfo uriInfo, final Request request, final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse, final SecurityContext securityContext, - final OidStringifier oidStringifier, final Localization localization, final AuthenticationSession authenticationSession, final PersistenceSession persistenceSession, final ObjectAdapterLookup objectAdapterLookup, final SpecificationLookup specificationLookup, IsisConfiguration configuration) { + final OidStringifier oidStringifier, final Localization localization, final AuthenticationSession authenticationSession, final PersistenceSession persistenceSession, final ObjectAdapterLookup objectAdapterLookup, final SpecificationLoader specificationLookup, IsisConfiguration configuration) { this.httpHeaders = httpHeaders; this.uriInfo = uriInfo; @@ -210,7 +210,7 @@ public class ResourceContext { return persistenceSession; } - public SpecificationLookup getSpecificationLookup() { + public SpecificationLoader getSpecificationLookup() { return specificationLookup; } Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java (original) +++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java Thu Aug 9 23:16:27 2012 @@ -46,9 +46,9 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.services.ServiceUtil; import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.restfulobjects.applib.RepresentationType; @@ -223,11 +223,11 @@ public abstract class ResourceAbstract { return IsisContext.getAuthenticationSession(); } - protected SpecificationLoader getSpecificationLoader() { + protected SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } - protected AdapterManager getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java (original) +++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java Thu Aug 9 23:16:27 2012 @@ -43,13 +43,12 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; 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.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException; import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope; @@ -521,7 +520,7 @@ public class DefaultOidObjectMapping imp // from context /////////////////////////////////////// - protected SpecificationLoader getSpecificationLoader() { + protected SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } @@ -529,7 +528,7 @@ public class DefaultOidObjectMapping imp return IsisContext.getPersistenceSession(); } - protected AdapterManagerExtended getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java (original) +++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/Mapping.java Thu Aug 9 23:16:27 2012 @@ -26,8 +26,8 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.RootOid; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.runtimes.dflt.runtime.memento.Memento; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; interface Mapping { @@ -168,7 +168,7 @@ class PersistentRootAdapterMapping imple } - protected AdapterManagerExtended getAdapterManager() { + protected AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java (original) +++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugAction.java Thu Aug 9 23:16:27 2012 @@ -35,7 +35,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.debug.DebuggableWithTitle; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer.Contributed; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; @@ -233,7 +233,7 @@ public class DebugAction implements Acti */ } - protected SpecificationLoader getSpecificationLoader() { + protected SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java (original) +++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/util/MethodsUtils.java Thu Aug 9 23:16:27 2012 @@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer.Contributed; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; -import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.runtimes.dflt.runtime.system.session.IsisSession; import org.apache.isis.viewer.scimpi.dispatcher.DispatchException; @@ -148,7 +148,7 @@ public class MethodsUtils { return IsisContext.getSession(); } - private static AdapterManager getAdapterManager() { + private static AdapterManagerSpi getAdapterManager() { return getPersistenceSession().getAdapterManager(); } Modified: incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java (original) +++ incubator/isis/trunk/framework/viewer/scimpi/scimpi-dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Debug.java Thu Aug 9 23:16:27 2012 @@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.fa import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.spec.ActionType; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.core.metamodel.spec.SpecificationLoader; +import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi; import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.core.metamodel.spec.feature.ObjectActionContainer.Contributed; import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter; @@ -236,7 +236,7 @@ public class Debug extends AbstractEleme } } - protected SpecificationLoader getSpecificationLoader() { + protected SpecificationLoaderSpi getSpecificationLoader() { return IsisContext.getSpecificationLoader(); } Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java?rev=1371529&r1=1371528&r2=1371529&view=diff ============================================================================== --- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java (original) +++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java Thu Aug 9 23:16:27 2012 @@ -31,8 +31,8 @@ import org.apache.isis.core.metamodel.fa import org.apache.isis.core.metamodel.spec.ObjectSpecId; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.runtimes.dflt.runtime.memento.Memento; -import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended; import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext; +import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManagerSpi; import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession; import org.apache.isis.viewer.wicket.model.util.Oids; @@ -99,7 +99,7 @@ public class ObjectAdapterMemento implem return getAdapterManager().recreatePersistentAdapter(oid); } - private AdapterManagerExtended getAdapterManager() { + private AdapterManagerSpi getAdapterManager() { return IsisContext.getPersistenceSession().getAdapterManager(); }