Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 83070 invoked from network); 16 Nov 2010 13:21:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Nov 2010 13:21:15 -0000 Received: (qmail 36395 invoked by uid 500); 16 Nov 2010 13:21:46 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 36379 invoked by uid 500); 16 Nov 2010 13:21:46 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 36372 invoked by uid 99); 16 Nov 2010 13:21:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Nov 2010 13:21:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Nov 2010 13:21:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7D4C2388AF0; Tue, 16 Nov 2010 13:19:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1035630 [6/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... Date: Tue, 16 Nov 2010 13:19:48 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101116131959.A7D4C2388AF0@eris.apache.org> Modified: incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java (original) +++ incubator/isis/trunk/viewer/bdd/concordion/src/main/java/org/apache/isis/viewer/bdd/concordion/AbstractIsisConcordionTest.java Tue Nov 16 13:19:36 2010 @@ -234,10 +234,6 @@ public class AbstractIsisConcordionTest // //////////////////////////////////////////////////////////////////////// public boolean aliasService(String aliasAs, String className) { - return aliasServices(aliasAs, className); - } - - public boolean aliasServices(String aliasAs, String className) { try { getStory().getAliasRegistry().aliasService(aliasAs, className); return true; Modified: incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml (original) +++ incubator/isis/trunk/viewer/bdd/src/docbkx/guide/isis-bdd-viewer.xml Tue Nov 16 13:19:36 2010 @@ -628,15 +628,22 @@ #bootstrapIsis(String configDirectory, String - deploymentType) + deploymentType):boolean Intended to be called from the XHTML - page, allowing the story document the bootstrapping process. - + page, allowing the story document the bootstrapping process. For + example, to bootstrap in exploration mode, use: + + <p concordion:execute="#result=bootstrapIsis(#configDir,#deploymentType)"> +Isis system <span concordion:assertTrue="#result">bootstrapped</span> from config directory <span concordion:set="#configDir">../quickrun/config</span> and running in <span concordion:set="#deploymentType">exploration</span> mode. +</p> + + The method always returns true, but any + runtime exception will propagate to the generated page. - Whichever is used, they both delegate to the common + Whichever method is used, they both delegate to the common Story#bootstrapIsis(...) method. @@ -697,12 +704,8 @@ - Story#getAliasRegistry()andAliasRegistry#aliasService(String - aliasAs, String - serviceClassName)Specifies an alias to - a service in order to invoke actions upon them.Note - that the services are not defined here, - merely aliased. + and + #aliasService(aliasAs, String serviceClassName)#aliasServices(aliasAs, @@ -798,8 +801,12 @@ Each of these is intended to be called from the - XHTML. The role list, if specified, should be - comma-separated (any white space will be ignored). + XHTML. For example: + + <p concordion:execute="#result=logonAs(#userName)"><span concordion:assertTrue="#result">logged on</span> as <span concordion:set="#userName">fsmith</span></p> + + The role list, if specified, should be comma-separated (any + white space will be ignored). @@ -914,7 +921,8 @@ Concordion The Concordion integration provides a number of overloaded - methods, all designed to be called from the XHTML: + methods, all designed to be called from the + XHTML: @@ -928,8 +936,14 @@ - The overloaded forms are just for convenience. The date/time - provided is parsed against the format 'dd MMM yyyy hh:mm' + For example: + + <p concordion:execute="#result=timeIs(#dateTime)">The <span concordion:assertTrue="#result">date/time</span> is <span concordion:set="#dateTime">2 mar 2007 09:20</span>.</p> + + The overloaded forms are just for convenience; sometimes the + story will want to emphasis the date, other times the time. In all + case the date/time provided is parsed against the format 'dd MMM + yyyy hh:mm' @@ -1002,17 +1016,61 @@ Aliasing Services - + Specifies an alias to a service in order to invoke actions upon + it. Typically this will be done for most if not all of the registered + repositories. The class name (as defined in + isis.properties) is used as the key; the alias + defines a simple handle. + + For example, a service + com.mycompany.customers.defaults.CustomerRepositoryDefault + can be mapped to "customers". Common - + The common library provides two methods: + + Story#getAliasRegistry() + + + + AliasRegistry#aliasService(String aliasAs, + String serviceClassName) + + + + The BDD framework integration is expected + to obtain the AliasRegistry from the + Story, and then use the + AliasRegisty to register the alias. Concordion + The Concordion integration provides a corresponding method, + #aliasService(aliasAs, String + serviceClassName). This returns true + if the service was found, false otherwise. Call within a table to + alias multiple services, for example:<table concordion:execute="#result=aliasService(#aliasAs, #className)"> + <tr> + <th concordion:set="#className">Class Name</th> + <th concordion:set="#aliasAs">aliasAs</th> + <th concordion:assertTrue="#result"/> + </tr> + <tr> + <td>org.apache.isis.support.prototype.objstore.dflt.claim.ClaimRepositoryInMemory</td> + <td>claims</td> + <td>ok</td> + </tr> + <tr> + <td>org.apache.isis.support.prototype.objstore.dflt.employee.EmployeeRepositoryInMemory</td> + <td>employees</td> + <td>ok</td> + </tr> +</table> + @@ -1020,6 +1078,24 @@ FitNesse + + + + + + + + + + Time Is Now + + date and time + + + + + + Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtImageFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtImageFactory.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtImageFactory.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/AwtImageFactory.java Tue Nov 16 13:19:36 2010 @@ -24,12 +24,12 @@ import java.awt.Toolkit; import java.awt.image.FilteredImageSource; import java.awt.image.RGBImageFilter; +import org.apache.isis.core.runtime.imageloader.TemplateImage; +import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; import org.apache.isis.extensions.dnd.drawing.Color; import org.apache.isis.extensions.dnd.drawing.Image; import org.apache.isis.extensions.dnd.drawing.ImageFactory; import org.apache.isis.extensions.dnd.view.base.AwtImage; -import org.apache.isis.runtime.imageloader.TemplateImage; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; public class AwtImageFactory extends ImageFactory { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/awt/XFeedbackManager.java Tue Nov 16 13:19:36 2010 @@ -26,6 +26,7 @@ import java.util.Vector; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; import org.apache.isis.extensions.dnd.view.BackgroundTask; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.Feedback; @@ -33,7 +34,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.message.ExceptionMessageContent; import org.apache.isis.extensions.dnd.view.message.TextMessageContent; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; public class XFeedbackManager implements Feedback { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewer.java Tue Nov 16 13:19:36 2010 @@ -33,6 +33,8 @@ import org.apache.isis.core.runtime.auth import org.apache.isis.core.runtime.authentication.standard.exploration.AuthenticationRequestExploration; import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.UserProfile; +import org.apache.isis.core.runtime.viewer.IsisViewerAbstract; import org.apache.isis.extensions.dnd.awt.AwtImageFactory; import org.apache.isis.extensions.dnd.awt.AwtToolkit; import org.apache.isis.extensions.dnd.awt.LoginDialog; @@ -95,8 +97,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.viewer.basic.InnerWorkspaceSpecification; import org.apache.isis.extensions.dnd.viewer.basic.RootWorkspaceSpecification; import org.apache.isis.extensions.dnd.viewer.basic.WrappedTextFieldSpecification; -import org.apache.isis.runtime.userprofile.UserProfile; -import org.apache.isis.runtime.viewer.IsisViewerAbstract; public class DndViewer extends IsisViewerAbstract { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewerInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/bootstrap/DndViewerInstaller.java Tue Nov 16 13:19:36 2010 @@ -20,8 +20,8 @@ package org.apache.isis.extensions.dnd.bootstrap; -import org.apache.isis.runtime.viewer.IsisViewer; -import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract; +import org.apache.isis.core.runtime.viewer.IsisViewer; +import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract; public class DndViewerInstaller extends IsisViewerInstallerAbstract { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/ConfigurableCompositeViewBorder.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/ConfigurableCompositeViewBorder.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/ConfigurableCompositeViewBorder.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/ConfigurableCompositeViewBorder.java Tue Nov 16 13:19:36 2010 @@ -23,6 +23,7 @@ package org.apache.isis.extensions.dnd.c import java.util.Enumeration; import org.apache.isis.core.commons.factory.InstanceFactory; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.configurable.GridListSpecification.ElementFactory; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.util.Properties; @@ -37,7 +38,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.base.UserViewSpecification; import org.apache.isis.extensions.dnd.view.composite.CompositeViewDecorator; import org.apache.isis.extensions.dnd.view.option.UserActionAbstract; -import org.apache.isis.runtime.userprofile.Options; public class ConfigurableCompositeViewBorder extends AbstractBorder { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectField.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectField.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectField.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectField.java Tue Nov 16 13:19:36 2010 @@ -21,8 +21,8 @@ package org.apache.isis.extensions.dnd.configurable; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; -import org.apache.isis.runtime.userprofile.Options; -import org.apache.isis.runtime.userprofile.OptionsAware; +import org.apache.isis.core.runtime.userprofile.Options; +import org.apache.isis.core.runtime.userprofile.OptionsAware; public class NewObjectField implements OptionsAware { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectView.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectView.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/configurable/NewObjectView.java Tue Nov 16 13:19:36 2010 @@ -25,6 +25,7 @@ import java.util.List; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Size; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.Toolkit; @@ -36,7 +37,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.composite.CompositeView; import org.apache.isis.extensions.dnd.view.composite.StackLayout; import org.apache.isis.extensions.dnd.view.content.FieldContent; -import org.apache.isis.runtime.userprofile.Options; public class NewObjectView extends CompositeView { StackLayout layout = new StackLayout(); Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/PerspectiveContent.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/PerspectiveContent.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/PerspectiveContent.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/PerspectiveContent.java Tue Nov 16 13:19:36 2010 @@ -25,10 +25,10 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.consent.Veto; import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.extensions.dnd.drawing.Image; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.content.AbstractContent; -import org.apache.isis.runtime.userprofile.PerspectiveEntry; public class PerspectiveContent extends AbstractContent { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/service/ServiceIcon.java Tue Nov 16 13:19:36 2010 @@ -22,6 +22,7 @@ package org.apache.isis.extensions.dnd.s import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.icon.Icon; @@ -38,7 +39,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.base.IconGraphic; import org.apache.isis.extensions.dnd.view.option.CloseViewOption; import org.apache.isis.extensions.dnd.view.text.ObjectTitleText; -import org.apache.isis.runtime.userprofile.PerspectiveEntry; public class ServiceIcon extends Icon { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/util/Properties.java Tue Nov 16 13:19:36 2010 @@ -27,10 +27,10 @@ import org.apache.isis.core.metamodel.co import org.apache.isis.core.metamodel.facets.actcoll.typeof.TypeOfFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.drawing.Size; import org.apache.isis.extensions.dnd.view.ViewSpecification; -import org.apache.isis.runtime.userprofile.Options; public class Properties { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/View.java Tue Nov 16 13:19:36 2010 @@ -24,13 +24,13 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.OptionsAware; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.Canvas; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.drawing.Padding; import org.apache.isis.extensions.dnd.drawing.Size; import org.apache.isis.extensions.dnd.util.Properties; -import org.apache.isis.runtime.userprofile.OptionsAware; public interface View extends Cloneable, OptionsAware { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractView.java Tue Nov 16 13:19:36 2010 @@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.co import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectActionType; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.Canvas; import org.apache.isis.extensions.dnd.drawing.Color; @@ -71,7 +72,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.content.RootObject; import org.apache.isis.extensions.dnd.view.option.OpenViewOption; import org.apache.isis.extensions.dnd.view.option.UserActionAbstract; -import org.apache.isis.runtime.userprofile.Options; public abstract class AbstractView implements View { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractViewDecorator.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractViewDecorator.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractViewDecorator.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/AbstractViewDecorator.java Tue Nov 16 13:19:36 2010 @@ -23,6 +23,7 @@ package org.apache.isis.extensions.dnd.v import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.Canvas; import org.apache.isis.extensions.dnd.drawing.Location; @@ -47,7 +48,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.ViewState; import org.apache.isis.extensions.dnd.view.Viewer; import org.apache.isis.extensions.dnd.view.Workspace; -import org.apache.isis.runtime.userprofile.Options; public abstract class AbstractViewDecorator implements View { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/UserViewSpecification.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/UserViewSpecification.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/UserViewSpecification.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/UserViewSpecification.java Tue Nov 16 13:19:36 2010 @@ -22,13 +22,13 @@ package org.apache.isis.extensions.dnd.v import java.util.Date; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.util.Properties; import org.apache.isis.extensions.dnd.view.Axes; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.ViewRequirement; import org.apache.isis.extensions.dnd.view.ViewSpecification; -import org.apache.isis.runtime.userprofile.Options; public class UserViewSpecification implements ViewSpecification { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/base/ViewUpdateNotifierImpl.java Tue Nov 16 13:19:36 2010 @@ -31,6 +31,8 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; +import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.ObjectContent; import org.apache.isis.extensions.dnd.view.View; @@ -38,8 +40,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.collection.RootCollection; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; -import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier; public class ViewUpdateNotifierImpl implements ViewUpdateNotifier { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/CompositeViewSpecification.java Tue Nov 16 13:19:36 2010 @@ -25,6 +25,7 @@ import java.util.List; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.util.Properties; import org.apache.isis.extensions.dnd.view.Axes; import org.apache.isis.extensions.dnd.view.Content; @@ -35,7 +36,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.ViewSpecification; import org.apache.isis.extensions.dnd.view.base.Layout; import org.apache.isis.extensions.dnd.view.window.SubviewFocusManager; -import org.apache.isis.runtime.userprofile.Options; public abstract class CompositeViewSpecification implements ViewSpecification { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/GridLayoutControlBorder.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/GridLayoutControlBorder.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/GridLayoutControlBorder.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/composite/GridLayoutControlBorder.java Tue Nov 16 13:19:36 2010 @@ -20,6 +20,7 @@ package org.apache.isis.extensions.dnd.view.composite; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.view.Axes; import org.apache.isis.extensions.dnd.view.UserActionSet; @@ -27,7 +28,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.extensions.dnd.view.base.AbstractBorder; import org.apache.isis.extensions.dnd.view.option.UserActionAbstract; -import org.apache.isis.runtime.userprofile.Options; public class GridLayoutControlBorder extends AbstractBorder { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/control/AbstractControlView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/control/AbstractControlView.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/control/AbstractControlView.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/control/AbstractControlView.java Tue Nov 16 13:19:36 2010 @@ -26,6 +26,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.consent.Veto; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.Canvas; import org.apache.isis.extensions.dnd.drawing.Location; @@ -53,7 +54,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.Viewer; import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.extensions.dnd.view.base.Layout; -import org.apache.isis.runtime.userprofile.Options; public abstract class AbstractControlView implements View { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugAdapter.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugAdapter.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugAdapter.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugAdapter.java Tue Nov 16 13:19:36 2010 @@ -23,7 +23,7 @@ package org.apache.isis.extensions.dnd.v import org.apache.isis.core.commons.debug.DebugInfo; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.runtime.util.Dump; +import org.apache.isis.core.runtime.util.Dump; public class DebugAdapter implements DebugInfo { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugDumpSnapshotOption.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugDumpSnapshotOption.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugDumpSnapshotOption.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugDumpSnapshotOption.java Tue Nov 16 13:19:36 2010 @@ -30,11 +30,11 @@ import org.apache.isis.core.metamodel.co import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.consent.Veto; import org.apache.isis.core.metamodel.spec.feature.ObjectActionType; +import org.apache.isis.core.runtime.logging.SnapshotAppender; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.extensions.dnd.view.option.UserActionAbstract; -import org.apache.isis.runtime.logging.SnapshotAppender; /** Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectGraph.java Tue Nov 16 13:19:36 2010 @@ -24,7 +24,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.util.Dump; +import org.apache.isis.core.runtime.util.Dump; public class DebugObjectGraph implements DebugInfo { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectSpecification.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectSpecification.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectSpecification.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugObjectSpecification.java Tue Nov 16 13:19:36 2010 @@ -24,7 +24,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.runtime.util.Dump; +import org.apache.isis.core.runtime.util.Dump; public class DebugObjectSpecification implements DebugInfo { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugOption.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugOption.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugOption.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugOption.java Tue Nov 16 13:19:36 2010 @@ -26,6 +26,7 @@ import java.util.List; import org.apache.isis.core.commons.debug.DebugInfo; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.feature.ObjectActionType; +import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.service.PerspectiveContent; import org.apache.isis.extensions.dnd.view.Content; @@ -33,7 +34,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.extensions.dnd.view.option.UserActionAbstract; -import org.apache.isis.runtime.userprofile.PerspectiveEntry; /** Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/debug/DebugView.java Tue Nov 16 13:19:36 2010 @@ -24,13 +24,13 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.util.Dump; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.DebugCanvas; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.ObjectContent; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.collection.CollectionContent; -import org.apache.isis.runtime.util.Dump; public class DebugView implements DebugInfo { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/view/option/DisposeObjectOption.java Tue Nov 16 13:19:36 2010 @@ -26,12 +26,12 @@ import org.apache.isis.core.metamodel.co import org.apache.isis.core.metamodel.consent.Veto; import org.apache.isis.core.metamodel.spec.feature.ObjectActionType; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.updatenotifier.UpdateNotifier; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.view.ObjectContent; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.runtime.persistence.PersistenceSession; -import org.apache.isis.runtime.transaction.updatenotifier.UpdateNotifier; /** Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/SkylarkViewFactory.java Tue Nov 16 13:19:36 2010 @@ -32,6 +32,7 @@ import org.apache.isis.core.commons.fact import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.facets.object.value.ValueFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.dialog.ActionDialogSpecification; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.interaction.ContentDragImpl; @@ -49,7 +50,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.collection.CollectionContent; import org.apache.isis.extensions.dnd.viewer.basic.FallbackView; import org.apache.isis.extensions.dnd.viewer.basic.MinimizedView; -import org.apache.isis.runtime.userprofile.Options; /** Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspace.java Tue Nov 16 13:19:36 2010 @@ -36,6 +36,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.specloader.SpecificationLoader; import org.apache.isis.core.runtime.authentication.standard.exploration.MultiUserExplorationSession; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.extensions.dnd.drawing.ColorsAndFonts; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.drawing.Padding; @@ -68,7 +69,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.window.WindowBorder; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; -import org.apache.isis.runtime.userprofile.PerspectiveEntry; public final class ApplicationWorkspace extends CompositeViewUsingBuilder implements Workspace { Modified: incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java (original) +++ incubator/isis/trunk/viewer/dnd/src/main/java/org/apache/isis/extensions/dnd/viewer/basic/ApplicationWorkspaceBuilder.java Tue Nov 16 13:19:36 2010 @@ -26,6 +26,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.facets.hide.HiddenFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.PerspectiveEntry; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.drawing.Size; import org.apache.isis.extensions.dnd.service.PerspectiveContent; @@ -34,7 +35,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.base.Layout; import org.apache.isis.extensions.dnd.view.composite.AbstractViewBuilder; -import org.apache.isis.runtime.userprofile.PerspectiveEntry; /** Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/DummyView.java Tue Nov 16 13:19:36 2010 @@ -28,6 +28,7 @@ import org.apache.isis.core.commons.exce import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; import org.apache.isis.core.metamodel.consent.Veto; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.extensions.dnd.drawing.Bounds; import org.apache.isis.extensions.dnd.drawing.Canvas; import org.apache.isis.extensions.dnd.drawing.Location; @@ -53,7 +54,6 @@ import org.apache.isis.extensions.dnd.vi import org.apache.isis.extensions.dnd.view.Viewer; import org.apache.isis.extensions.dnd.view.Workspace; import org.apache.isis.extensions.dnd.view.base.Layout; -import org.apache.isis.runtime.userprofile.Options; public class DummyView implements View { Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/util/PropertiesTest.java Tue Nov 16 13:19:36 2010 @@ -24,8 +24,8 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.junit.Ignore; import org.junit.Test; +import org.apache.isis.core.runtime.userprofile.Options; import org.apache.isis.runtime.testsystem.TestProxySystemII; -import org.apache.isis.runtime.userprofile.Options; import static org.junit.Assert.*; Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/MultilineTextFieldContentTest.java Tue Nov 16 13:19:36 2010 @@ -38,15 +38,15 @@ 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.IsisContextStatic; +import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; +import org.apache.isis.core.runtime.userprofile.UserProfileLoader; import org.apache.isis.extensions.dnd.view.text.CursorPosition; import org.apache.isis.extensions.dnd.view.text.TextBlockTarget; import org.apache.isis.extensions.dnd.view.text.TextContent; import org.apache.isis.extensions.dnd.view.text.TextSelection; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.runtime.session.IsisSessionFactoryDefault; import org.apache.isis.runtime.system.DeploymentType; -import org.apache.isis.runtime.userprofile.UserProfileLoader; @RunWith(JMock.class) Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/view/text/TextFieldContentTest.java Tue Nov 16 13:19:36 2010 @@ -40,17 +40,17 @@ 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.IsisContextStatic; +import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; +import org.apache.isis.core.runtime.userprofile.UserProfileLoader; import org.apache.isis.extensions.dnd.drawing.Location; import org.apache.isis.extensions.dnd.view.text.CursorPosition; import org.apache.isis.extensions.dnd.view.text.TextBlockTarget; import org.apache.isis.extensions.dnd.view.text.TextContent; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; 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.userprofile.UserProfileLoader; @RunWith(JMock.class) Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/ViewUpdateNotifierTest.java Tue Nov 16 13:19:36 2010 @@ -48,12 +48,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.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.core.runtime.userprofile.UserProfileLoader; import org.apache.isis.extensions.dnd.DummyView; import org.apache.isis.extensions.dnd.DummyWorkspaceView; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.base.ViewUpdateNotifierImpl; import org.apache.isis.extensions.dnd.view.content.RootObject; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.runtime.session.IsisSessionFactory; @@ -61,10 +65,6 @@ import org.apache.isis.runtime.session.I import org.apache.isis.runtime.system.DeploymentType; import org.apache.isis.runtime.testsystem.TestProxyAdapter; import org.apache.isis.runtime.testsystem.TestProxySystem; -import org.apache.isis.runtime.transaction.IsisTransaction; -import org.apache.isis.runtime.transaction.IsisTransactionManager; -import org.apache.isis.runtime.userprofile.UserProfile; -import org.apache.isis.runtime.userprofile.UserProfileLoader; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ActionFieldBuilderTest.java Tue Nov 16 13:19:36 2010 @@ -43,18 +43,18 @@ 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.UserProfile; +import org.apache.isis.core.runtime.userprofile.UserProfileLoader; import org.apache.isis.extensions.dnd.DummyView; import org.apache.isis.extensions.dnd.dialog.ActionFieldBuilder; import org.apache.isis.extensions.dnd.view.Axes; import org.apache.isis.extensions.dnd.view.Content; import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.ViewFactory; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; import org.apache.isis.runtime.session.IsisSessionFactoryDefault; import org.apache.isis.runtime.system.DeploymentType; -import org.apache.isis.runtime.userprofile.UserProfile; -import org.apache.isis.runtime.userprofile.UserProfileLoader; @RunWith(JMock.class) Modified: incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java (original) +++ incubator/isis/trunk/viewer/dnd/src/test/java/org/apache/isis/extensions/dnd/viewer/basic/ScrollBorderTest.java Tue Nov 16 13:19:36 2010 @@ -38,6 +38,8 @@ 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.IsisContextStatic; +import org.apache.isis.core.runtime.imageloader.TemplateImageLoader; +import org.apache.isis.core.runtime.userprofile.UserProfileLoader; import org.apache.isis.extensions.dnd.DummyView; import org.apache.isis.extensions.dnd.TestToolkit; import org.apache.isis.extensions.dnd.drawing.Location; @@ -45,12 +47,10 @@ import org.apache.isis.extensions.dnd.dr import org.apache.isis.extensions.dnd.view.View; import org.apache.isis.extensions.dnd.view.ViewAreaType; import org.apache.isis.extensions.dnd.view.border.ScrollBorder; -import org.apache.isis.runtime.imageloader.TemplateImageLoader; import org.apache.isis.runtime.persistence.PersistenceSessionFactory; 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.userprofile.UserProfileLoader; @RunWith(JMock.class) Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/action/edit/Save.java Tue Nov 16 13:19:36 2010 @@ -22,13 +22,13 @@ package org.apache.isis.extensions.html. import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.IsisTransactionManager; import org.apache.isis.extensions.html.action.Action; import org.apache.isis.extensions.html.component.Page; import org.apache.isis.extensions.html.context.Context; import org.apache.isis.extensions.html.request.ForwardRequest; import org.apache.isis.extensions.html.request.Request; import org.apache.isis.runtime.persistence.PersistenceSession; -import org.apache.isis.runtime.transaction.IsisTransactionManager; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/Context.java Tue Nov 16 13:19:36 2010 @@ -39,6 +39,7 @@ import org.apache.isis.core.metamodel.au import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.UserProfile; import org.apache.isis.extensions.html.component.Block; import org.apache.isis.extensions.html.component.ComponentFactory; import org.apache.isis.extensions.html.crumb.CollectionCrumb; @@ -50,7 +51,6 @@ import org.apache.isis.extensions.html.r import org.apache.isis.extensions.html.task.Task; import org.apache.isis.runtime.persistence.ConcurrencyException; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; -import org.apache.isis.runtime.userprofile.UserProfile; public class Context { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/context/TransientObjectMapping.java Tue Nov 16 13:19:36 2010 @@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.metamodel.adapter.version.Version; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.memento.Memento; +import org.apache.isis.core.runtime.memento.Memento; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/internal/WebController.java Tue Nov 16 13:19:36 2010 @@ -33,6 +33,8 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.userprofile.UserProfile; +import org.apache.isis.core.runtime.util.Dump; import org.apache.isis.extensions.html.action.Action; import org.apache.isis.extensions.html.action.ActionException; import org.apache.isis.extensions.html.action.ChangeContext; @@ -64,8 +66,6 @@ import org.apache.isis.extensions.html.t import org.apache.isis.extensions.html.task.TaskStep; import org.apache.isis.runtime.persistence.adaptermanager.AdapterManager; import org.apache.isis.runtime.system.internal.monitor.Monitor; -import org.apache.isis.runtime.userprofile.UserProfile; -import org.apache.isis.runtime.util.Dump; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/InvokeMethod.java Tue Nov 16 13:19:36 2010 @@ -29,13 +29,13 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.ObjectAction; import org.apache.isis.core.metamodel.util.CollectionFacetUtils; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; import org.apache.isis.extensions.html.action.Action; import org.apache.isis.extensions.html.action.ActionException; import org.apache.isis.extensions.html.component.Page; import org.apache.isis.extensions.html.context.Context; import org.apache.isis.extensions.html.request.ForwardRequest; import org.apache.isis.extensions.html.request.Request; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; public final class InvokeMethod implements Action { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/task/MethodTask.java Tue Nov 16 13:19:36 2010 @@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter; import org.apache.isis.core.metamodel.spec.feature.ParseableEntryActionParameter; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; import org.apache.isis.extensions.html.component.Page; import org.apache.isis.extensions.html.context.Context; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/viewer/HtmlViewerInstaller.java Tue Nov 16 13:19:36 2010 @@ -22,16 +22,16 @@ package org.apache.isis.extensions.html. import org.apache.isis.core.commons.lang.MapUtils; import org.apache.isis.core.runtime.Isis; +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; import org.apache.isis.core.webapp.IsisSessionFilter; import org.apache.isis.core.webapp.StaticContentFilter; import org.apache.isis.core.webapp.servlets.ResourceServlet; import org.apache.isis.extensions.html.servlet.ControllerServlet; import org.apache.isis.extensions.html.servlet.HtmlServletConstants; import org.apache.isis.extensions.html.servlet.LogonServlet; -import org.apache.isis.runtime.viewer.IsisViewer; -import org.apache.isis.runtime.viewer.IsisViewerInstallerAbstract; -import org.apache.isis.runtime.web.EmbeddedWebViewer; -import org.apache.isis.runtime.web.WebAppSpecification; /** Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java (original) +++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/IsisTestRunner.java Tue Nov 16 13:19:36 2010 @@ -43,12 +43,12 @@ import org.apache.isis.core.runtime.auth import org.apache.isis.core.runtime.authentication.standard.exploration.ExplorationSession; import org.apache.isis.core.runtime.authentication.standard.fixture.AuthenticationRequestLogonFixture; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.installers.InstallerLookupDefault; +import org.apache.isis.core.runtime.installers.InstallerLookupDefault; +import org.apache.isis.core.runtime.transaction.IsisTransactionManager; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.runtime.system.DeploymentType; import org.apache.isis.runtime.system.Splash; import org.apache.isis.runtime.system.SystemConstants; -import org.apache.isis.runtime.transaction.IsisTransactionManager; import org.apache.isis.viewer.junit.internal.IsisSystemUsingInstallersWithinJunit; Modified: incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java (original) +++ incubator/isis/trunk/viewer/junit/src/main/java/org/apache/isis/viewer/junit/internal/IsisSystemUsingInstallersWithinJunit.java Tue Nov 16 13:19:36 2010 @@ -21,12 +21,12 @@ package org.apache.isis.viewer.junit.internal; import org.apache.isis.core.commons.exceptions.IsisException; +import org.apache.isis.core.runtime.installers.InstallerLookup; +import org.apache.isis.core.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller; import org.apache.isis.runtime.authentication.standard.noop.NoopAuthenticationManagerInstaller; import org.apache.isis.runtime.authorization.standard.noop.NoopAuthorizationManagerInstaller; -import org.apache.isis.runtime.installers.InstallerLookup; import org.apache.isis.runtime.system.DeploymentType; import org.apache.isis.runtime.system.installers.IsisSystemUsingInstallers; -import org.apache.isis.runtime.userprofile.inmemory.InMemoryUserProfileStoreInstaller; import org.junit.internal.runners.TestClass; public class IsisSystemUsingInstallersWithinJunit extends IsisSystemUsingInstallers { Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java (original) +++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/EmbeddedWebViewerRestful.java Tue Nov 16 13:19:36 2010 @@ -1,11 +1,11 @@ package org.apache.isis.viewer.restful.viewer.embedded; import org.apache.isis.core.commons.lang.MapUtils; +import org.apache.isis.core.runtime.web.EmbeddedWebViewer; +import org.apache.isis.core.runtime.web.WebAppSpecification; import org.apache.isis.core.webapp.IsisSessionFilter; import org.apache.isis.core.webapp.StaticContentFilter; import org.apache.isis.core.webapp.servlets.ResourceServlet; -import org.apache.isis.runtime.web.EmbeddedWebViewer; -import org.apache.isis.runtime.web.WebAppSpecification; import org.apache.isis.viewer.restful.viewer.RestfulApplication; import org.apache.isis.viewer.restful.viewer.authentication.AuthenticationSessionLookupStrategyParams; import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher; Modified: incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/restful/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/embedded/RestfulViewerInstaller.java Tue Nov 16 13:19:36 2010 @@ -1,8 +1,8 @@ package org.apache.isis.viewer.restful.viewer.embedded; -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.core.runtime.viewer.IsisViewer; +import org.apache.isis.core.runtime.viewer.IsisViewerInstallerAbstract; +import org.apache.isis.core.runtime.web.WebAppSpecification; /** * Convenience implementation of a {@link NakedObjectsViewer} providing the Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/context/Mapping.java Tue Nov 16 13:19:36 2010 @@ -26,7 +26,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.runtime.context.IsisContext; -import org.apache.isis.runtime.memento.Memento; +import org.apache.isis.core.runtime.memento.Memento; interface Mapping { ObjectAdapter getObject(); Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/debug/DebugAction.java Tue Nov 16 13:19:36 2010 @@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.core.metamodel.spec.feature.ObjectMember; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.util.Dump; +import org.apache.isis.core.runtime.util.Dump; import org.apache.isis.webapp.Action; import org.apache.isis.webapp.Dispatcher; import org.apache.isis.webapp.context.RequestContext; Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/debug/Debug.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/debug/Debug.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/debug/Debug.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/debug/Debug.java Tue Nov 16 13:19:36 2010 @@ -27,7 +27,7 @@ import org.apache.isis.core.commons.debu import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.util.Dump; +import org.apache.isis.core.runtime.util.Dump; import org.apache.isis.webapp.AbstractElementProcessor; import org.apache.isis.webapp.context.RequestContext; import org.apache.isis.webapp.processor.Request; Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Messages.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Messages.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Messages.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Messages.java Tue Nov 16 13:19:36 2010 @@ -23,7 +23,7 @@ package org.apache.isis.webapp.view.disp import java.util.List; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; import org.apache.isis.webapp.AbstractElementProcessor; import org.apache.isis.webapp.processor.Request; Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Warnings.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Warnings.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Warnings.java (original) +++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/webapp/view/display/Warnings.java Tue Nov 16 13:19:36 2010 @@ -23,7 +23,7 @@ package org.apache.isis.webapp.view.disp import java.util.List; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.transaction.messagebroker.MessageBroker; +import org.apache.isis.core.runtime.transaction.messagebroker.MessageBroker; import org.apache.isis.webapp.AbstractElementProcessor; import org.apache.isis.webapp.processor.Request; Modified: incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java (original) +++ incubator/isis/trunk/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/ObjectAdapterMemento.java Tue Nov 16 13:19:36 2010 @@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet; import org.apache.isis.core.metamodel.spec.ObjectSpecification; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.memento.Memento; +import org.apache.isis.core.runtime.memento.Memento; import org.apache.isis.runtime.persistence.PersistenceSession; import org.apache.isis.viewer.wicket.model.util.Oids; Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java (original) +++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/blocks/propcoll/EntityPropertiesAndOrCollectionsPanel.java Tue Nov 16 13:19:36 2010 @@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation; import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; import org.apache.isis.core.progmodel.facets.object.validate.ValidateObjectFacet; -import org.apache.isis.runtime.memento.Memento; +import org.apache.isis.core.runtime.memento.Memento; import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento; import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel; import org.apache.isis.viewer.wicket.model.models.EntityModel; Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java (original) +++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java Tue Nov 16 13:19:36 2010 @@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation; import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters; import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation; -import org.apache.isis.runtime.memento.Memento; +import org.apache.isis.core.runtime.memento.Memento; import org.apache.isis.viewer.wicket.model.mementos.ActionMemento; import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento; import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento; Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (original) +++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Tue Nov 16 13:19:36 2010 @@ -25,7 +25,7 @@ import java.util.ServiceLoader; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.runtime.runner.IsisModule; +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.viewer.wicket.model.mementos.ObjectAdapterMemento; Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java?rev=1035630&r1=1035629&r2=1035630&view=diff ============================================================================== --- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java (original) +++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java Tue Nov 16 13:19:36 2010 @@ -22,9 +22,9 @@ package org.apache.isis.viewer.wicket.vi import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.runtime.context.IsisContext; +import org.apache.isis.core.runtime.transaction.IsisTransaction; +import org.apache.isis.core.runtime.transaction.IsisTransactionManager; import org.apache.isis.runtime.session.IsisSession; -import org.apache.isis.runtime.transaction.IsisTransaction; -import org.apache.isis.runtime.transaction.IsisTransactionManager; import org.apache.log4j.Logger; import org.apache.wicket.Response; import org.apache.wicket.protocol.http.WebApplication;