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 2011/04/29 01:05:58 UTC

svn commit: r1097654 [6/12] - in /incubator/isis/trunk: core/commons/src/main/java/org/apache/isis/core/commons/debug/ core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/ core/runtime/ core/runtime/src/main/java/org/apache/isis/core/ru...

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/PersistenceSessionObjectStore.java Thu Apr 28 23:05:40 2011
@@ -34,6 +34,7 @@ import org.apache.isis.core.commons.debu
 import org.apache.isis.core.commons.ensure.Assert;
 import org.apache.isis.core.commons.lang.ToString;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapterFactory;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.facets.object.callbacks.CallbackUtils;
@@ -46,28 +47,27 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.services.ServicesInjector;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
 import org.apache.isis.runtimes.dflt.runtime.persistence.FixturesInstalledFlag;
 import org.apache.isis.runtimes.dflt.runtime.persistence.NotPersistableException;
 import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionAbstract;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSessionFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adapterfactory.AdapterFactory;
-import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.persistence.adaptermanager.AdapterManagerExtended;
-import org.apache.isis.runtimes.dflt.runtime.persistence.objectfactory.ObjectFactory;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm.PersistAlgorithm;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm.ToPersistObjectSet;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.CreateObjectCommand;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.ObjectStoreTransactionManager;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.transaction.SaveObjectCommand;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
+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.ObjectFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionFactory;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
 import org.apache.isis.runtimes.dflt.runtime.transaction.ObjectPersistenceException;
 import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureAbstract;
 import org.apache.isis.runtimes.dflt.runtime.transaction.TransactionalClosureWithReturnAbstract;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
 import org.apache.log4j.Logger;
 
 public class PersistenceSessionObjectStore extends PersistenceSessionAbstract implements ToPersistObjectSet {
@@ -81,7 +81,7 @@ public class PersistenceSessionObjectSto
      * the object that are saved.
      */
     public PersistenceSessionObjectStore(final PersistenceSessionFactory persistenceSessionFactory,
-        final AdapterFactory adapterFactory, final ObjectFactory objectFactory,
+        final ObjectAdapterFactory adapterFactory, final ObjectFactory objectFactory,
         final ServicesInjector servicesInjector, final OidGenerator oidGenerator,
         final AdapterManagerExtended identityMap, final PersistAlgorithm persistAlgorithm,
         final ObjectStorePersistence objectStore) {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/ToPersistObjectSet.java Thu Apr 28 23:05:40 2011
@@ -21,7 +21,7 @@
 package org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
 
 /**

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/algorithm/package-info.java Thu Apr 28 23:05:40 2011
@@ -19,22 +19,22 @@
 
 
 /**
- * This interface is used by the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession} and
+ * This interface is used by the {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession} and
  * is generally not intended to be implemented directly.  
  * 
  * <p>
  * The {@link PersistAlgorithm} defines how persistence-by-reachability is enacted.  This only
  * applies to the <tt>ObjectStorePersistor</tt> implementation, but has been brought up into
  * <tt>architecture</tt> module because it is very much a peer of the other helper objects
- * that influence the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession}'s behaviour, such
- * as {@link ClassSubstitutor} and {@link org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator}. 
+ * that influence the {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession}'s behaviour, such
+ * as {@link ClassSubstitutor} and {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator}. 
  * 
  * <p>
- * Since there is a close dependency between the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession}
- * and the {@link PersistAlgorithm} implementation, it is the job of the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller} to
+ * Since there is a close dependency between the {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession}
+ * and the {@link PersistAlgorithm} implementation, it is the job of the {@link org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller} to
  * ensure that the correct {@link PersistAlgorithm} is setup.
  * 
  * @see org.apache.isis.metamodel.specloader.classsubstitutor.classsubstitor.ClassSubstitutor.ClassStrategy
- * @see org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator
+ * @see org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator
  */
 package org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm;
\ No newline at end of file

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransaction.java Thu Apr 28 23:05:40 2011
@@ -29,10 +29,10 @@ import org.apache.isis.core.commons.lang
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreTransactionManagement;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.IsisTransactionManager;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
 import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionAbstract;
-import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManager;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
 
 
 public class ObjectStoreTransaction extends IsisTransactionAbstract  {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/ObjectStoreTransactionManager.java Thu Apr 28 23:05:40 2011
@@ -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.runtimes.dflt.runtime.persistence.PersistenceSessionTransactionManagement;
 import org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.ObjectStoreTransactionManagement;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSessionTransactionManagement;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.MessageBroker;
+import org.apache.isis.runtimes.dflt.runtime.system.transaction.UpdateNotifier;
 import org.apache.isis.runtimes.dflt.runtime.transaction.IsisTransactionManagerAbstract;
-import org.apache.isis.runtimes.dflt.runtime.transaction.messagebroker.MessageBroker;
-import org.apache.isis.runtimes.dflt.runtime.transaction.updatenotifier.UpdateNotifier;
 
 
 public class ObjectStoreTransactionManager extends IsisTransactionManagerAbstract<ObjectStoreTransaction> {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/objectstore/transaction/PersistenceCommandAbstract.java Thu Apr 28 23:05:40 2011
@@ -22,7 +22,7 @@ package org.apache.isis.runtimes.dflt.ru
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
 
 public abstract class PersistenceCommandAbstract implements PersistenceCommand {
 	

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAbstract.java Thu Apr 28 23:05:40 2011
@@ -22,6 +22,7 @@ package org.apache.isis.runtimes.dflt.ru
 
 import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.hex.OidStringifierHex;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 
 
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAware.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAware.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAware.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/OidGeneratorAware.java Thu Apr 28 23:05:40 2011
@@ -19,6 +19,8 @@
 
 
 package org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator;
+
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 
 
 public interface OidGeneratorAware {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/package-info.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 /**
- * This interface is used by the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession} and
+ * This interface is used by the {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession} and
  * is generally not intended to be implemented directly.  
  * 
  * <p>
@@ -29,11 +29,12 @@
  * for Hibernate will hook into Hibernate's own identity generators.
  * 
  * <p>
- * Since there is a close dependency between the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession}
- * and the {@link ClassSubstitutor} implementation, it is the job of the {@link org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller} to
+ * Since there is a close dependency between the {@link org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession}
+ * and the {@link ClassSubstitutor} implementation, it is the job of the {@link org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller} to
  * ensure that the correct {@link OidGenerator} is setup.
  * 
  * @see org.apache.isis.runtimes.dflt.runtime.persistence.objectstore.algorithm.PersistAlgorithm
  * @see org.apache.isis.metamodel.specloader.classsubstitutor.classsubstitor.ClassSubstitutor.ClassStrategy
  */
-package org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator;
\ No newline at end of file
+package org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/oidgenerator/simple/SimpleOidGenerator.java Thu Apr 28 23:05:40 2011
@@ -23,8 +23,8 @@ package org.apache.isis.runtimes.dflt.ru
 import org.apache.isis.core.commons.debug.DebugBuilder;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;
 import org.apache.isis.core.metamodel.adapter.oid.stringable.directly.OidStringifierDirect;
-import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGenerator;
 import org.apache.isis.runtimes.dflt.runtime.persistence.oidgenerator.OidGeneratorAbstract;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 
 import static org.apache.isis.core.commons.ensure.Ensure.ensureThatArg;
 import static org.apache.isis.core.commons.matchers.IsisMatchers.greaterThan;

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/package-info.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/package-info.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/package-info.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/package-info.java Thu Apr 28 23:05:40 2011
@@ -44,4 +44,5 @@
  * responsibility of the {@link PersistenceMechanismInstaller} to ensure that the correct helper objects
  * are passed to the {@link PersistenceSession} implementation. 
  */
-package org.apache.isis.runtimes.dflt.runtime.persistence;
\ No newline at end of file
+package org.apache.isis.runtimes.dflt.runtime.persistence;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryAbstract.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryAbstract.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryAbstract.java Thu Apr 28 23:05:40 2011
@@ -28,7 +28,8 @@ import org.apache.isis.core.commons.enco
 import org.apache.isis.core.commons.encoding.Encodable;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
 
 
 public abstract class PersistenceQueryAbstract implements PersistenceQuery, Encodable {

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryBuiltIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryBuiltIn.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryBuiltIn.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/query/PersistenceQueryBuiltIn.java Thu Apr 28 23:05:40 2011
@@ -23,6 +23,7 @@ package org.apache.isis.runtimes.dflt.ru
 import org.apache.isis.applib.DomainObjectContainer;
 import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceQuery;
 
 public interface PersistenceQueryBuiltIn extends PersistenceQuery {
 

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/Constants.java Thu Apr 28 23:05:40 2011
@@ -22,11 +22,11 @@ package org.apache.isis.runtimes.dflt.ru
 
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
 import org.apache.isis.core.runtime.logging.LoggingConstants;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtimes.dflt.runtime.remoting.ClientConnectionInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.ClientConnectionInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStoreInstaller;
-import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstaller;
 
 public final class Constants {
     

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisModule.java Thu Apr 28 23:05:40 2011
@@ -26,14 +26,15 @@ import java.util.List;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
 import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller;
 import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookupDefault;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemThatUsesInstallersFactory;
 import org.apache.isis.runtimes.dflt.runtime.system.IsisSystem;
 import org.apache.isis.runtimes.dflt.runtime.system.IsisSystemFactory;
+import org.apache.isis.runtimes.dflt.runtime.systemdependencyinjector.SystemDependencyInjector;
+import org.apache.isis.runtimes.dflt.runtime.systemusinginstallers.IsisSystemThatUsesInstallersFactory;
 import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewer;
-import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstaller;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;

Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java?rev=1097654&r1=1097653&r2=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/IsisRunner.java Thu Apr 28 23:05:40 2011
@@ -35,29 +35,30 @@ import org.apache.isis.core.commons.conf
 import org.apache.isis.core.commons.config.IsisConfigurationBuilderDefault;
 import org.apache.isis.core.commons.config.ConfigurationConstants;
 import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookup;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandler;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerLookup;
 import org.apache.isis.runtimes.dflt.runtime.installers.InstallerLookupDefault;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerAdditionalProperty;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerConfiguration;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerConnector;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerDebug;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerDeploymentType;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerDiagnostics;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerFixture;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerHelp;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerNoSplash;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerPersistor;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerQuiet;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerReflector;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerUserProfileStore;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerVerbose;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerVersion;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerViewer;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandler;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionValidator;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionValidatorForConnector;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionValidatorForPersistor;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionValidatorForViewers;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerAdditionalProperty;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerConfiguration;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerConnector;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerDebug;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerDeploymentType;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerDiagnostics;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerFixture;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerHelp;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerNoSplash;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerPersistor;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerQuiet;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerReflector;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerUserProfileStore;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerVerbose;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerVersion;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionHandlerViewer;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionValidator;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionValidatorForConnector;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionValidatorForPersistor;
+import org.apache.isis.runtimes.dflt.runtime.runner.opts.OptionValidatorForViewers;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
 import com.google.inject.Guice;

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerAdditionalProperty.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerAdditionalProperty.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerAdditionalProperty.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerAdditionalProperty.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerAdditionalProperty.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerAdditionalProperty.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerAdditionalProperty.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.ADDITIONAL_PROPERTY;
 
@@ -30,9 +30,9 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 
 public class OptionHandlerAdditionalProperty extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConfiguration.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConfiguration.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConfiguration.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConfiguration.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConfiguration.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConfiguration.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
@@ -27,9 +27,9 @@ import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.CONFIGURATION_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.CONFIGURATION_OPT;

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConnector.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConnector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConnector.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConnector.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConnector.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerConnector.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerConnector.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.CONNECTOR_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.CONNECTOR_OPT;
@@ -32,12 +32,12 @@ import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerRepository;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerRepository;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
-import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstaller;
 
 public class OptionHandlerConnector extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDebug.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDebug.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDebug.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDebug.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDebug.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDebug.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDebug.java Thu Apr 28 23:05:40 2011
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.DEBUG_OPT;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentType.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentType.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentType.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentType.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentType.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentType.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
@@ -27,9 +27,9 @@ import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.config.NotFoundPolicy;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentTypeIsis.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentTypeIsis.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentTypeIsis.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDeploymentTypeIsis.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDeploymentTypeIsis.java Thu Apr 28 23:05:40 2011
@@ -19,21 +19,21 @@
 
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_CLIENT;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_EXPLORATION;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_PROTOTYPE;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_SERVER;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_SERVER_EXPLORATION;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_SERVER_PROTOTYPE;
-import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.TYPE_SINGLE_USER;
-
 
 public class OptionHandlerDeploymentTypeIsis extends OptionHandlerDeploymentType {
-  
+  
+    public static final String TYPE_EXPLORATION = DeploymentType.EXPLORATION.friendlyName();
+    public static final String TYPE_PROTOTYPE = DeploymentType.PROTOTYPE.friendlyName();
+    public static final String TYPE_SINGLE_USER = DeploymentType.SINGLE_USER.friendlyName();
+    public static final String TYPE_CLIENT = DeploymentType.CLIENT.friendlyName();
+    public static final String TYPE_SERVER_EXPLORATION = DeploymentType.SERVER_EXPLORATION.friendlyName();
+    public static final String TYPE_SERVER_PROTOTYPE = DeploymentType.SERVER_PROTOTYPE.friendlyName();
+    public static final String TYPE_SERVER = DeploymentType.SERVER.friendlyName();
+
     public OptionHandlerDeploymentTypeIsis() {
         super(DeploymentType.PROTOTYPE, TYPE_EXPLORATION + "; " + TYPE_PROTOTYPE + " (default); " + TYPE_SINGLE_USER + "; " + TYPE_CLIENT + "; "
                 + TYPE_SERVER_EXPLORATION + "; " + TYPE_SERVER_PROTOTYPE + "; " + TYPE_SERVER);

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDiagnostics.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDiagnostics.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDiagnostics.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDiagnostics.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDiagnostics.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerDiagnostics.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerDiagnostics.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.DIAGNOSTICS_OPT;
 
@@ -26,9 +26,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerDiagnostics extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerFixture.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerFixture.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerFixture.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerFixture.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerFixture.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerFixture.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerFixture.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.FIXTURE_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.FIXTURE_OPT;
@@ -29,9 +29,9 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerFixture extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerHelp.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerHelp.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerHelp.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerHelp.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerHelp.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerHelp.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerHelp.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.HELP_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.HELP_OPT;
@@ -27,9 +27,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 
 public class OptionHandlerHelp extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerNoSplash.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerNoSplash.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerNoSplash.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerNoSplash.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerNoSplash.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerNoSplash.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerNoSplash.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.NO_SPLASH_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.NO_SPLASH_OPT;
@@ -27,8 +27,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPassword.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPassword.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPassword.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPassword.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPassword.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPassword.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPassword.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.PASSWORD_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.PASSWORD_OPT;
@@ -29,9 +29,9 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerPassword extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPersistor.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPersistor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPersistor.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPersistor.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPersistor.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerPersistor.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerPersistor.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
@@ -26,11 +26,11 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerRepository;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceMechanismInstaller;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerRepository;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.PersistenceMechanismInstaller;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.OBJECT_PERSISTENCE_LONG_OPT;

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerQuiet.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerQuiet.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerQuiet.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerQuiet.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerQuiet.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerQuiet.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerQuiet.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.QUIET_OPT;
 
@@ -26,8 +26,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 
 public class OptionHandlerQuiet extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerReflector.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerReflector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerReflector.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerReflector.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerReflector.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerReflector.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerReflector.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.REFLECTOR_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.REFLECTOR_OPT;
@@ -30,10 +30,10 @@ import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.metamodel.specloader.ObjectReflectorInstaller;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerRepository;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerRepository;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerReflector extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUser.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUser.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUser.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUser.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUser.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUser.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUser.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.USER_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.USER_OPT;
@@ -29,9 +29,9 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerUser extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUserProfileStore.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUserProfileStore.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUserProfileStore.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUserProfileStore.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUserProfileStore.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerUserProfileStore.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerUserProfileStore.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.USER_PROFILE_STORE_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.USER_PROFILE_STORE_OPT;
@@ -29,10 +29,10 @@ import org.apache.commons.cli.OptionBuil
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerRepository;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerRepository;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 import org.apache.isis.runtimes.dflt.runtime.userprofile.UserProfileStoreInstaller;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVerbose.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVerbose.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVerbose.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVerbose.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVerbose.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVerbose.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVerbose.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.VERBOSE_OPT;
 
@@ -26,8 +26,8 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerVerbose extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVersion.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVersion.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVersion.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVersion.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVersion.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerVersion.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerVersion.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.VERSION_OPT;
 
@@ -26,9 +26,9 @@ import org.apache.commons.cli.CommandLin
 import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
 
 public class OptionHandlerVersion extends OptionHandlerAbstract {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerViewer.java (from r1097414, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerViewer.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerViewer.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerViewer.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerViewer.java&r1=1097414&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/options/standard/OptionHandlerViewer.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionHandlerViewer.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.options.standard;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.VIEWER_LONG_OPT;
 import static org.apache.isis.runtimes.dflt.runtime.runner.Constants.VIEWER_OPT;
@@ -32,12 +32,12 @@ import org.apache.commons.cli.Options;
 
 import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
 import org.apache.isis.core.commons.lang.ListUtils;
-import org.apache.isis.runtimes.dflt.runtime.installers.InstallerRepository;
-import org.apache.isis.runtimes.dflt.runtime.runner.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.BootPrinter;
+import org.apache.isis.core.runtime.optionhandler.OptionHandlerAbstract;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.InstallerRepository;
+import org.apache.isis.runtimes.dflt.runtime.installerregistry.installerapi.IsisViewerInstaller;
 import org.apache.isis.runtimes.dflt.runtime.runner.Constants;
-import org.apache.isis.runtimes.dflt.runtime.runner.options.OptionHandlerAbstract;
 import org.apache.isis.runtimes.dflt.runtime.system.SystemConstants;
-import org.apache.isis.runtimes.dflt.runtime.viewer.IsisViewerInstaller;
 
 public class OptionHandlerViewer extends OptionHandlerAbstract {
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidator.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidator.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidator.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidator.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidator.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidator.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidator.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForConnector.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForConnector.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForConnector.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForConnector.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForConnector.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForConnector.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForConnector.java Thu Apr 28 23:05:40 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import java.util.List;
 
 import org.apache.isis.applib.maybe.Maybe;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerConnector;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
 public final class OptionValidatorForConnector implements OptionValidator {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForPersistor.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForPersistor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForPersistor.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForPersistor.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForPersistor.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForPersistor.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForPersistor.java Thu Apr 28 23:05:40 2011
@@ -18,11 +18,10 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.isis.applib.maybe.Maybe;
 import org.apache.isis.core.commons.lang.StringUtils;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerPersistor;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
 public final class OptionValidatorForPersistor implements

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForViewers.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForViewers.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForViewers.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForViewers.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForViewers.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorForViewers.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorForViewers.java Thu Apr 28 23:05:40 2011
@@ -18,12 +18,11 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import java.util.List;
 
 import org.apache.isis.applib.maybe.Maybe;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerViewer;
 import org.apache.isis.runtimes.dflt.runtime.runner.IsisRunner;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorUserAndPasswordCombo.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorUserAndPasswordCombo.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorUserAndPasswordCombo.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/OptionValidatorUserAndPasswordCombo.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/OptionValidatorUserAndPasswordCombo.java Thu Apr 28 23:05:40 2011
@@ -18,11 +18,9 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import org.apache.isis.applib.maybe.Maybe;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerPassword;
-import org.apache.isis.runtimes.dflt.runtime.options.standard.OptionHandlerUser;
 import org.apache.isis.runtimes.dflt.runtime.system.DeploymentType;
 
 public final class OptionValidatorUserAndPasswordCombo implements

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/Strings.java (from r1096322, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/Strings.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/Strings.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/Strings.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/Strings.java&r1=1096322&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/options/Strings.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/runner/opts/Strings.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.runner.options;
+package org.apache.isis.runtimes.dflt.runtime.runner.opts;
 
 import java.util.List;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/InitialisationException.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/InitialisationException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/InitialisationException.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/InitialisationException.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/InitialisationException.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/InitialisationException.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/InitialisationException.java Thu Apr 28 23:05:40 2011
@@ -17,7 +17,7 @@
  *  under the License.
  */
 
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
 
 import org.apache.isis.core.commons.exceptions.IsisException;
 

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/RepositoryHelper.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/RepositoryHelper.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/RepositoryHelper.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/RepositoryHelper.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/RepositoryHelper.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/RepositoryHelper.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/RepositoryHelper.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,10 +30,10 @@ import org.apache.isis.core.metamodel.fa
 import org.apache.isis.core.metamodel.services.container.query.QueryCardinality;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.SpecificationLoader;
-import org.apache.isis.runtimes.dflt.runtime.context.IsisContext;
-import org.apache.isis.runtimes.dflt.runtime.persistence.PersistenceSession;
-import org.apache.isis.runtimes.dflt.runtime.persistence.query.PersistenceQuery;
 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.PersistenceQuery;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
 
 
 public final class RepositoryHelper {

Copied: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServiceException.java (from r1097164, incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServiceException.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServiceException.java?p2=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServiceException.java&p1=incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServiceException.java&r1=1097164&r2=1097654&rev=1097654&view=diff
==============================================================================
--- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/services/ServiceException.java (original)
+++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/services/ServiceException.java Thu Apr 28 23:05:40 2011
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.runtimes.dflt.runtime.persistence.services;
+package org.apache.isis.runtimes.dflt.runtime.services;
 
 import org.apache.isis.core.commons.exceptions.IsisException;