You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/11/16 14:19:48 UTC
svn commit: r1035630 [5/6] - in /incubator/isis/trunk:
alternatives/objectstore/nosql/src/test/java/org/apache/isis/extensions/nosql/
alternatives/objectstore/sql/persistor/src/main/java/org/apache/isis/extensions/sql/objectstore/
alternatives/objectst...
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=1035630&r1=1035629&r2=1035630&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 Tue Nov 16 13:19:36 2010
@@ -27,7 +27,8 @@ import static org.apache.isis.core.commo
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.services.ServicesInjector;
-import org.apache.isis.runtime.logging.Logger;
+import org.apache.isis.core.runtime.logging.Logger;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstallerAbstract;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
@@ -40,7 +41,6 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.persistence.objectstore.algorithm.dflt.DefaultPersistAlgorithm;
import org.apache.isis.runtime.persistence.objectstore.transaction.ObjectStoreTransactionManager;
import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
public abstract class ObjectStorePersistenceMechanismInstallerAbstract extends PersistenceMechanismInstallerAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreTransactionManagement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreTransactionManagement.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreTransactionManagement.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreTransactionManagement.java Tue Nov 16 13:19:36 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.persiste
import java.util.List;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.runtime.persistence.objectstore.transaction.ObjectStoreTransaction;
import org.apache.isis.runtime.persistence.objectstore.transaction.ObjectStoreTransactionManager;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommand;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
/**
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=1035630&r1=1035629&r2=1035630&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 Tue Nov 16 13:19:36 2010
@@ -47,6 +47,10 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CallbackUtils;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.transaction.TransactionalClosureAbstract;
+import org.apache.isis.core.runtime.transaction.TransactionalClosureWithReturnAbstract;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtime.persistence.FixturesInstalledFlag;
import org.apache.isis.runtime.persistence.NotPersistableException;
import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;
@@ -63,10 +67,6 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.runtime.persistence.oidgenerator.OidGenerator;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.transaction.TransactionalClosureAbstract;
-import org.apache.isis.runtime.transaction.TransactionalClosureWithReturnAbstract;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.log4j.Logger;
public class PersistenceSessionObjectStore extends PersistenceSessionAbstract implements ToPersistObjectSet {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/dflt/DefaultPersistAlgorithm.java Tue Nov 16 13:19:36 2010
@@ -31,9 +31,9 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CallbackUtils;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public class DefaultPersistAlgorithm extends PersistAlgorithmAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/algorithm/topdown/TopDownPersistAlgorithm.java Tue Nov 16 13:19:36 2010
@@ -34,9 +34,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.util.CallbackUtils;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.persistence.objectstore.algorithm.PersistAlgorithmAbstract;
import org.apache.isis.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public class TopDownPersistAlgorithm extends PersistAlgorithmAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java Tue Nov 16 13:19:36 2010
@@ -28,11 +28,11 @@ import org.apache.log4j.Logger;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
+import org.apache.isis.core.runtime.transaction.IsisTransactionAbstract;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtime.persistence.objectstore.ObjectStoreTransactionManagement;
-import org.apache.isis.runtime.transaction.IsisTransactionAbstract;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
public class ObjectStoreTransaction extends IsisTransactionAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java Tue Nov 16 13:19:36 2010
@@ -26,11 +26,11 @@ import static org.hamcrest.CoreMatchers.
import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
import org.apache.log4j.Logger;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManagerAbstract;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtime.persistence.PersistenceSessionTransactionManagement;
import org.apache.isis.runtime.persistence.objectstore.ObjectStoreTransactionManagement;
-import org.apache.isis.runtime.transaction.IsisTransactionManagerAbstract;
-import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
public class ObjectStoreTransactionManager extends IsisTransactionManagerAbstract<ObjectStoreTransaction> {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/ServicesInstallerAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/ServicesInstallerAbstract.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/ServicesInstallerAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/ServicesInstallerAbstract.java Tue Nov 16 13:19:36 2010
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.isis.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.installers.InstallerAbstract;
import org.apache.isis.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/persistence/services/config/ServicesFromConfiguration.java Tue Nov 16 13:19:36 2010
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.runtime.fixture.ObjectFixtureService;
-import org.apache.isis.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.installers.InstallerAbstract;
import org.apache.isis.runtime.persistence.services.InitialisationException;
import org.apache.isis.runtime.persistence.services.ServicesInstaller;
import org.apache.isis.runtime.persistence.services.SimpleRepository;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java Tue Nov 16 13:19:36 2010
@@ -25,10 +25,10 @@ import org.apache.isis.core.commons.comp
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
+import org.apache.isis.core.runtime.transaction.IsisTransaction;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.system.IsisSystem;
-import org.apache.isis.runtime.transaction.IsisTransaction;
-import org.apache.isis.runtime.userprofile.UserProfile;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionDefault.java Tue Nov 16 13:19:36 2010
@@ -34,12 +34,12 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.transaction.IsisTransaction;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.transaction.IsisTransaction;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.userprofile.UserProfile;
import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java Tue Nov 16 13:19:36 2010
@@ -29,12 +29,12 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.system.ContextCategory;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryAbstract.java Tue Nov 16 13:19:36 2010
@@ -34,13 +34,13 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.userprofile.UserProfile;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java Tue Nov 16 13:19:36 2010
@@ -26,10 +26,10 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
/**
* As its superclass, but provides a default for some of more basic components (that
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsiSsystemUsingInstallersFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsiSsystemUsingInstallersFactory.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsiSsystemUsingInstallersFactory.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsiSsystemUsingInstallersFactory.java Tue Nov 16 13:19:36 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.system;
-import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers;
import com.google.inject.Inject;
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemAbstract.java Tue Nov 16 13:19:36 2010
@@ -34,9 +34,10 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.imageloader.awt.TemplateImageLoaderAwt;
-import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.awt.TemplateImageLoaderAwt;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
@@ -44,7 +45,6 @@ import org.apache.isis.runtime.system.in
import org.apache.isis.runtime.system.internal.IsisLocaleInitializer;
import org.apache.isis.runtime.system.internal.IsisTimeZoneInitializer;
import org.apache.isis.runtime.system.internal.SplashWindow;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
import org.apache.log4j.Logger;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/IsisSystemSimple.java Tue Nov 16 13:19:36 2010
@@ -32,11 +32,11 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.imageloader.awt.TemplateImageLoaderAwt;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.awt.TemplateImageLoaderAwt;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/SystemConstants.java Tue Nov 16 13:19:36 2010
@@ -29,16 +29,16 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoaderInstaller;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
+import org.apache.isis.core.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
+import org.apache.isis.core.runtime.viewer.IsisViewer;
+import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
+import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtime.remoting.ClientConnectionInstaller;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
-import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;
-import org.apache.isis.runtime.viewer.IsisViewer;
-import org.apache.isis.runtime.viewer.IsisViewerInstaller;
-import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
public final class SystemConstants {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/facetdecorators/ReflectionPeerBuilder.java Tue Nov 16 13:19:36 2010
@@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.facetdecorator.FacetDecorator;
import org.apache.isis.core.metamodel.facets.Facet;
import org.apache.isis.core.runtime.context.IsisContext;
-import org.apache.isis.runtime.i18n.resourcebundle.I18nFacetDecorator;
-import org.apache.isis.runtime.i18n.resourcebundle.ResourceBasedI18nManager;
-import org.apache.isis.runtime.transaction.facetdecorator.standard.StandardTransactionFacetDecorator;
+import org.apache.isis.core.runtime.i18n.resourcebundle.I18nFacetDecorator;
+import org.apache.isis.core.runtime.i18n.resourcebundle.ResourceBasedI18nManager;
+import org.apache.isis.core.runtime.transaction.facetdecorator.standard.StandardTransactionFacetDecorator;
/**
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/installers/IsisSystemUsingInstallers.java Tue Nov 16 13:19:36 2010
@@ -36,25 +36,25 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.imageloader.TemplateImageLoaderInstaller;
-import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderInstaller;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.core.runtime.transaction.facetdecorator.standard.TransactionFacetDecoratorInstaller;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoaderDefault;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
import org.apache.isis.runtime.persistence.services.ServicesInstaller;
-import org.apache.isis.runtime.remoting.ClientConnectionInstaller;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystemAbstract;
import org.apache.isis.runtime.system.IsisSystemException;
import org.apache.isis.runtime.system.SystemConstants;
-import org.apache.isis.runtime.transaction.facetdecorator.standard.TransactionFacetDecoratorInstaller;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.runtime.userprofile.UserProfileLoaderDefault;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
-import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;
import org.apache.log4j.Logger;
public class IsisSystemUsingInstallers extends IsisSystemAbstract {
Modified: incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java (original)
+++ incubator/isis/trunk/core/runtime/src/main/java/org/apache/isis/runtime/system/internal/SplashWindow.java Tue Nov 16 13:19:36 2010
@@ -30,8 +30,8 @@ import java.awt.Window;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.runtime.about.AboutIsis;
-import org.apache.isis.runtime.imageloader.TemplateImage;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImage;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
import org.apache.log4j.Logger;
public class SplashWindow extends Window implements Runnable {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/core/runtime/context/IsisContextTest.java Tue Nov 16 13:19:36 2010
@@ -39,7 +39,9 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.context.IsisContextStatic;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfile;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
@@ -49,8 +51,6 @@ import org.apache.isis.runtime.system.De
import org.apache.isis.runtime.testsystem.TestProxyPersistenceSession;
import org.apache.isis.runtime.testsystem.TestProxyReflector;
import org.apache.isis.runtime.testsystem.TestProxySession;
-import org.apache.isis.runtime.userprofile.UserProfile;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/help/file/SimpleHelpManagerTest.java Tue Nov 16 13:19:36 2010
@@ -29,6 +29,7 @@ import junit.framework.TestCase;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
import org.apache.isis.core.metamodel.config.internal.PropertiesConfiguration;
+import org.apache.isis.core.runtime.help.file.FileBasedHelpManager;
public class SimpleHelpManagerTest extends TestCase {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest.java Tue Nov 16 13:19:36 2010
@@ -27,6 +27,7 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.memento.Memento;
import org.apache.isis.runtime.testsystem.ProxyJunit4TestCase;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest2_Test.java Tue Nov 16 13:19:36 2010
@@ -42,6 +42,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.runtime.context.IsisContextStatic;
+import org.apache.isis.core.runtime.memento.Data;
+import org.apache.isis.core.runtime.memento.Memento;
+import org.apache.isis.core.runtime.memento.ObjectData;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/memento/MementoTest3_Test.java Tue Nov 16 13:19:36 2010
@@ -45,6 +45,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.ObjectReflector;
import org.apache.isis.core.runtime.context.IsisContextStatic;
+import org.apache.isis.core.runtime.memento.CollectionData;
+import org.apache.isis.core.runtime.memento.Data;
+import org.apache.isis.core.runtime.memento.Memento;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/ObjectStoreSpy.java Tue Nov 16 13:19:36 2010
@@ -30,6 +30,7 @@ import org.apache.isis.core.metamodel.ad
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.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.runtime.persistence.UnsupportedFindException;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
@@ -38,7 +39,6 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public class ObjectStoreSpy implements ObjectStore, ObjectStoreTransactionManagement {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/TransactionTest.java Tue Nov 16 13:19:36 2010
@@ -33,12 +33,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtime.persistence.objectstore.ObjectStoreSpy;
import org.apache.isis.runtime.testsystem.TestProxySystem;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
-import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
@RunWith(JMock.class)
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTest.java Tue Nov 16 13:19:36 2010
@@ -20,7 +20,7 @@
package org.apache.isis.runtime.profiler;
-import org.apache.isis.runtime.profiler.Profiler;
+import org.apache.isis.core.runtime.profiler.Profiler;
import junit.framework.TestCase;
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/profiler/ProfilerTestSystem.java Tue Nov 16 13:19:36 2010
@@ -20,6 +20,8 @@
package org.apache.isis.runtime.profiler;
+import org.apache.isis.core.runtime.profiler.ProfilerSystem;
+
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit3TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit3TestCase.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit3TestCase.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit3TestCase.java Tue Nov 16 13:19:36 2010
@@ -25,12 +25,12 @@ import junit.framework.TestCase;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerPersist;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerTestSupport;
import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
public abstract class ProxyJunit3TestCase extends TestCase {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit4TestCase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit4TestCase.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit4TestCase.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/ProxyJunit4TestCase.java Tue Nov 16 13:19:36 2010
@@ -24,11 +24,11 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.Before;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManagerTestSupport;
import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
public abstract class ProxyJunit4TestCase {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxyPersistenceSession.java Tue Nov 16 13:19:36 2010
@@ -35,6 +35,11 @@ import org.apache.isis.core.metamodel.se
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.IsisTransactionDefault;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManagerAbstract;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.PersistenceSessionAbstract;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
@@ -43,11 +48,6 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
import org.apache.isis.runtime.persistence.objectfactory.ObjectFactoryAbstract.Mode;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtime.transaction.IsisTransactionDefault;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.transaction.IsisTransactionManagerAbstract;
-import org.apache.isis.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
/**
* Static mock implementation of {@link PersistenceSession} that provides some partial implementation but also has
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystem.java Tue Nov 16 13:19:36 2010
@@ -37,8 +37,16 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.context.IsisContextStatic;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
-import org.apache.isis.runtime.imageloader.TemplateImageLoaderNoop;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoaderNoop;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier;
+import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifierDefault;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoaderDefault;
+import org.apache.isis.core.runtime.userprofile.UserProfileStore;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoaderDefault.Mode;
+import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStore;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adapterfactory.AdapterFactory;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
@@ -50,14 +58,6 @@ import org.apache.isis.runtime.session.I
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier;
-import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifierDefault;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
-import org.apache.isis.runtime.userprofile.UserProfileLoaderDefault;
-import org.apache.isis.runtime.userprofile.UserProfileStore;
-import org.apache.isis.runtime.userprofile.UserProfileLoaderDefault.Mode;
-import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStore;
//TODO replace with TestProxySystemII
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoop.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoop.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoop.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoop.java Tue Nov 16 13:19:36 2010
@@ -23,6 +23,7 @@ package org.apache.isis.runtime.transact
import java.util.List;
import org.apache.isis.core.commons.components.Noop;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
public class MessageBrokerNoop implements MessageBroker, Noop {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/transaction/messagebroker/MessageBrokerNoopInstaller.java Tue Nov 16 13:19:36 2010
@@ -22,7 +22,9 @@ package org.apache.isis.runtime.transact
import java.util.List;
-import org.apache.isis.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker;
+import org.apache.isis.core.runtime.transaction.messagebroker.MessageBrokerInstaller;
public class MessageBrokerNoopInstaller extends InstallerAbstract implements MessageBrokerInstaller {
Modified: incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/userprofile/OptionsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/userprofile/OptionsTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/userprofile/OptionsTest.java (original)
+++ incubator/isis/trunk/core/runtime/src/test/java/org/apache/isis/runtime/userprofile/OptionsTest.java Tue Nov 16 13:19:36 2010
@@ -25,6 +25,7 @@ import java.util.Iterator;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.commons.debug.DebugString;
+import org.apache.isis.core.runtime.userprofile.Options;
import static org.junit.Assert.*;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java Tue Nov 16 13:19:36 2010
@@ -32,10 +32,10 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.config.ConfigurationBuilderResourceStreams;
import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
import org.apache.isis.core.metamodel.config.NotFoundPolicy;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.installers.InstallerLookupDefault;
-import org.apache.isis.runtime.logging.IsisLoggingConfigurer;
-import org.apache.isis.runtime.runner.IsisModule;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.installers.InstallerLookupDefault;
+import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
+import org.apache.isis.core.runtime.runner.IsisModule;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
import org.apache.isis.runtime.system.SystemConstants;
Modified: incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java (original)
+++ incubator/isis/trunk/core/webapp/src/main/java/org/apache/isis/core/webapp/monitor/WebServerMonitorInstaller.java Tue Nov 16 13:19:36 2010
@@ -20,10 +20,10 @@
package org.apache.isis.core.webapp.monitor;
-import org.apache.isis.runtime.viewer.IsisViewer;
-import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract;
-import org.apache.isis.runtime.web.WebAppSpecification;
-import org.apache.isis.runtime.web.EmbeddedWebViewer;
+import org.apache.isis.core.runtime.viewer.IsisViewer;
+import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract;
+import org.apache.isis.core.runtime.web.EmbeddedWebViewer;
+import org.apache.isis.core.runtime.web.WebAppSpecification;
public class WebServerMonitorInstaller extends IsisViewerInstallerAbstract {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServer.java Tue Nov 16 13:19:36 2010
@@ -23,11 +23,11 @@ package org.apache.isis.core.webserver;
import org.apache.isis.core.commons.lang.ArrayUtils;
+import org.apache.isis.core.runtime.runner.IsisRunner;
import org.apache.isis.core.webserver.internal.OptionHandlerAddress;
import org.apache.isis.core.webserver.internal.OptionHandlerDeploymentTypeWebServer;
import org.apache.isis.core.webserver.internal.OptionHandlerPort;
import org.apache.isis.core.webserver.internal.OptionHandlerResourceBase;
-import org.apache.isis.runtime.runner.IsisRunner;
public class WebServer {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java Tue Nov 16 13:19:36 2010
@@ -36,9 +36,9 @@ import org.apache.isis.core.commons.lang
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
import org.apache.isis.core.metamodel.config.ConfigurationPrimer;
import org.apache.isis.core.metamodel.config.IsisConfiguration;
+import org.apache.isis.core.runtime.runner.IsisBootstrapper;
+import org.apache.isis.core.runtime.runner.IsisRunner;
import org.apache.isis.core.webapp.WebAppConstants;
-import org.apache.isis.runtime.runner.IsisBootstrapper;
-import org.apache.isis.runtime.runner.IsisRunner;
import com.google.inject.Injector;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerConstants.java Tue Nov 16 13:19:36 2010
@@ -21,7 +21,7 @@
package org.apache.isis.core.webserver;
import org.apache.isis.core.metamodel.config.ConfigurationConstants;
-import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
+import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
public final class WebServerConstants {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java Tue Nov 16 13:19:36 2010
@@ -38,12 +38,12 @@ import org.mortbay.jetty.servlet.Servlet
import org.mortbay.jetty.servlet.ServletMapping;
import org.mortbay.jetty.servlet.SessionHandler;
import org.apache.isis.core.commons.factory.InstanceFactory;
+import org.apache.isis.core.runtime.web.EmbeddedWebServerAbstract;
+import org.apache.isis.core.runtime.web.FilterSpecification;
+import org.apache.isis.core.runtime.web.ServletSpecification;
+import org.apache.isis.core.runtime.web.WebAppSpecification;
import org.apache.isis.core.webserver.WebServerConstants;
import org.apache.isis.core.webserver.WebServerException;
-import org.apache.isis.runtime.web.EmbeddedWebServerAbstract;
-import org.apache.isis.runtime.web.FilterSpecification;
-import org.apache.isis.runtime.web.ServletSpecification;
-import org.apache.isis.runtime.web.WebAppSpecification;
public class EmbeddedWebServerJetty extends EmbeddedWebServerAbstract {
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/JettyEmbeddedWebServerInstaller.java Tue Nov 16 13:19:36 2010
@@ -22,11 +22,11 @@ package org.apache.isis.core.webserver.e
import java.util.List;
-import org.apache.isis.runtime.installers.InstallerAbstract;
-import org.apache.isis.runtime.viewer.IsisViewerInstaller;
-import org.apache.isis.runtime.web.EmbeddedWebServer;
-import org.apache.isis.runtime.web.EmbeddedWebServerInstaller;
-import org.apache.isis.runtime.web.EmbeddedWebViewer;
+import org.apache.isis.core.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
+import org.apache.isis.core.runtime.web.EmbeddedWebServer;
+import org.apache.isis.core.runtime.web.EmbeddedWebServerInstaller;
+import org.apache.isis.core.runtime.web.EmbeddedWebViewer;
/**
* Not to be confused with {@link IsisViewerInstaller}, this installer
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerAddress.java Tue Nov 16 13:19:36 2010
@@ -28,9 +28,9 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.runner.options.OptionHandler;
import org.apache.isis.core.webserver.WebServerConstants;
-import org.apache.isis.runtime.runner.BootPrinter;
-import org.apache.isis.runtime.runner.options.OptionHandler;
public final class OptionHandlerAddress implements OptionHandler {
private String address;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerDeploymentTypeWebServer.java Tue Nov 16 13:19:36 2010
@@ -20,11 +20,11 @@
package org.apache.isis.core.webserver.internal;
-import static org.apache.isis.runtime.runner.Constants.TYPE_SERVER;
-import static org.apache.isis.runtime.runner.Constants.TYPE_SERVER_EXPLORATION;
-import static org.apache.isis.runtime.runner.Constants.TYPE_SERVER_PROTOTYPE;
+import static org.apache.isis.core.runtime.runner.Constants.TYPE_SERVER;
+import static org.apache.isis.core.runtime.runner.Constants.TYPE_SERVER_EXPLORATION;
+import static org.apache.isis.core.runtime.runner.Constants.TYPE_SERVER_PROTOTYPE;
-import org.apache.isis.runtime.options.standard.OptionHandlerDeploymentType;
+import org.apache.isis.core.runtime.options.standard.OptionHandlerDeploymentType;
import org.apache.isis.runtime.system.DeploymentType;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerPort.java Tue Nov 16 13:19:36 2010
@@ -28,9 +28,9 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.runner.options.OptionHandler;
import org.apache.isis.core.webserver.WebServerConstants;
-import org.apache.isis.runtime.runner.BootPrinter;
-import org.apache.isis.runtime.runner.options.OptionHandler;
public final class OptionHandlerPort implements OptionHandler {
private Integer port;
Modified: incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java (original)
+++ incubator/isis/trunk/core/webserver/src/main/java/org/apache/isis/core/webserver/internal/OptionHandlerResourceBase.java Tue Nov 16 13:19:36 2010
@@ -25,9 +25,9 @@ import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.isis.core.metamodel.config.ConfigurationBuilder;
+import org.apache.isis.core.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.runner.options.OptionHandler;
import org.apache.isis.core.webserver.WebServerConstants;
-import org.apache.isis.runtime.runner.BootPrinter;
-import org.apache.isis.runtime.runner.options.OptionHandler;
public final class OptionHandlerResourceBase implements OptionHandler {
private String resourceBase;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/InMemoryObjectStore.java Tue Nov 16 13:19:36 2010
@@ -37,6 +37,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.util.CollectionFacetUtils;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjectsDefault;
@@ -57,7 +58,6 @@ import org.apache.isis.runtime.persisten
import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
import org.apache.isis.runtime.persistence.query.PersistenceQuery;
import org.apache.isis.runtime.persistence.query.PersistenceQueryBuiltIn;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/AbstractInMemoryPersistenceCommand.java Tue Nov 16 13:19:36 2010
@@ -23,10 +23,10 @@ package org.apache.isis.runtime.objectst
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStoreInstances;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandAbstract;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public abstract class AbstractInMemoryPersistenceCommand extends PersistenceCommandAbstract {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryCreateObjectCommand.java Tue Nov 16 13:19:36 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.CreateObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersistenceCommand implements
CreateObjectCommand {
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemoryDestroyObjectCommand.java Tue Nov 16 13:19:36 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public final class InMemoryDestroyObjectCommand
extends AbstractInMemoryPersistenceCommand
Modified: incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/main/java/org/apache/isis/runtime/objectstore/inmemory/internal/commands/InMemorySaveObjectCommand.java Tue Nov 16 13:19:36 2010
@@ -22,10 +22,10 @@ package org.apache.isis.runtime.objectst
import org.apache.log4j.Logger;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.runtime.transaction.ObjectPersistenceException;
import org.apache.isis.runtime.objectstore.inmemory.internal.ObjectStorePersistedObjects;
import org.apache.isis.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtime.transaction.ObjectPersistenceException;
public final class InMemorySaveObjectCommand
extends AbstractInMemoryPersistenceCommand
Modified: incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java (original)
+++ incubator/isis/trunk/defaults/objectstore/src/test/java/org/apache/isis/runtime/testsystem/TestProxySystemII.java Tue Nov 16 13:19:36 2010
@@ -35,14 +35,14 @@ import org.apache.isis.core.runtime.auth
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.context.IsisContextStatic;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.defaults.progmodel.JavaReflectorInstaller;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtime.objectstore.inmemory.InMemoryPersistenceMechanismInstaller;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtime.system.DeploymentType;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
/*
* TODO allow to be created with specific requirements for components being set up rather than using mocks.
Modified: incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/main/java/org/apache/isis/defaults/progmodel/JavaReflectorInstaller.java Tue Nov 16 13:19:36 2010
@@ -42,9 +42,9 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverser;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
-import org.apache.isis.runtime.installers.InstallerAbstract;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.installers.InstallerLookupAware;
+import org.apache.isis.core.runtime.installers.InstallerAbstract;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.installers.InstallerLookupAware;
import com.google.common.collect.Lists;
Modified: incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java (original)
+++ incubator/isis/trunk/defaults/progmodel/src/test/java/org/apache/isis/metamodel/specloader/JavaReflectorTestAbstract.java Tue Nov 16 13:19:36 2010
@@ -38,16 +38,16 @@ import org.apache.isis.core.progmodel.fa
import org.apache.isis.core.runtime.authentication.AuthenticationManager;
import org.apache.isis.core.runtime.authorization.AuthorizationManager;
import org.apache.isis.core.runtime.context.IsisContextStatic;
+import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
+import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
import org.apache.isis.defaults.progmodel.JavaReflector;
import org.apache.isis.defaults.progmodel.ProgrammingModelFacetsJava5;
-import org.apache.isis.runtime.imageloader.TemplateImageLoader;
import org.apache.isis.runtime.persistence.PersistenceSessionFactory;
import org.apache.isis.runtime.persistence.internal.RuntimeContextFromSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.testsystem.TestClassSubstitutor;
-import org.apache.isis.runtime.userprofile.UserProfileLoader;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.jmock.Expectations;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/Story.java Tue Nov 16 13:19:36 2010
@@ -17,17 +17,17 @@ import org.apache.isis.core.metamodel.co
import org.apache.isis.core.metamodel.config.ConfigurationBuilderFileSystem;
import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.fixturesinstaller.FixturesInstallerNoop;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.installers.InstallerLookupDefault;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.installers.InstallerLookupDefault;
+import org.apache.isis.core.runtime.runner.IsisModule;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
+import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
-import org.apache.isis.runtime.runner.IsisModule;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
import org.apache.isis.runtime.system.SystemConstants;
import org.apache.isis.runtime.system.internal.InitialisationSession;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
import org.apache.isis.viewer.bdd.common.components.StoryAuthenticationManagerInstaller;
import org.apache.isis.viewer.bdd.common.components.StoryInMemoryPersistenceMechanismInstaller;
import org.apache.isis.viewer.bdd.common.story.bootstrapping.OpenSession;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/components/IsisSystemUsingInstallersWithinStory.java Tue Nov 16 13:19:36 2010
@@ -1,12 +1,12 @@
package org.apache.isis.viewer.bdd.common.components;
import org.apache.isis.core.runtime.authentication.AuthenticationManagerInstaller;
-import org.apache.isis.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
+import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
import org.apache.isis.runtime.persistence.PersistenceMechanismInstaller;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers;
-import org.apache.isis.runtime.userprofile.UserProfileStoreInstaller;
-import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller;
public class IsisSystemUsingInstallersWithinStory extends
IsisSystemUsingInstallers {
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/fixtures/AbstractFixturePeer.java Tue Nov 16 13:19:36 2010
@@ -6,11 +6,11 @@ import java.util.List;
import org.apache.isis.core.metamodel.authentication.AuthenticationSession;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.transaction.IsisTransactionManager;
import org.apache.isis.runtime.persistence.PersistenceSession;
import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager;
import org.apache.isis.runtime.persistence.objectstore.ObjectStorePersistence;
import org.apache.isis.runtime.persistence.objectstore.PersistenceSessionObjectStore;
-import org.apache.isis.runtime.transaction.IsisTransactionManager;
import org.apache.isis.viewer.bdd.common.AliasRegistry;
import org.apache.isis.viewer.bdd.common.CellBinding;
Modified: incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/StartClient.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/StartClient.java?rev=1035630&r1=1035629&r2=1035630&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/StartClient.java (original)
+++ incubator/isis/trunk/viewer/bdd/common/src/main/java/org/apache/isis/viewer/bdd/common/story/bootstrapping/StartClient.java Tue Nov 16 13:19:36 2010
@@ -1,8 +1,8 @@
package org.apache.isis.viewer.bdd.common.story.bootstrapping;
-import org.apache.isis.runtime.installers.InstallerLookup;
-import org.apache.isis.runtime.viewer.IsisViewer;
-import org.apache.isis.runtime.viewer.IsisViewerInstaller;
+import org.apache.isis.core.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.viewer.IsisViewer;
+import org.apache.isis.core.runtime.viewer.IsisViewerInstaller;
import org.apache.isis.viewer.bdd.common.Story;
public class StartClient extends AbstractHelper {