Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 52872 invoked from network); 16 Nov 2010 18:41:57 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Nov 2010 18:41:57 -0000 Received: (qmail 66005 invoked by uid 500); 16 Nov 2010 18:42:28 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 65990 invoked by uid 500); 16 Nov 2010 18:42:28 -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 65983 invoked by uid 99); 16 Nov 2010 18:42:28 -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 18:42:28 +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 18:42:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 15CE623889DD; Tue, 16 Nov 2010 18:41:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1035738 [2/2] - in /incubator/isis/trunk/viewer: bdd/src/docbkx/guide/ html/src/main/java/org/apache/isis/extensions/html/action/ html/src/main/java/org/apache/isis/extensions/html/action/edit/ html/src/main/java/org/apache/isis/extensions... Date: Tue, 16 Nov 2010 18:41:10 -0000 To: isis-commits@incubator.apache.org From: danhaywood@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101116184112.15CE623889DD@eris.apache.org> Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/HtmlTable.java Tue Nov 16 18:41:06 2010 @@ -18,13 +18,13 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.ComponentComposite; -import org.apache.isis.extensions.html.component.Table; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.ComponentComposite; +import org.apache.isis.viewer.html.component.Table; public class HtmlTable extends ComponentComposite implements Table { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Link.java Tue Nov 16 18:41:06 2010 @@ -18,11 +18,11 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Component; public class Link implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/LogonFormPage.java Tue Nov 16 18:41:06 2010 @@ -18,14 +18,14 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Block; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.DebugPane; -import org.apache.isis.extensions.html.component.ViewPane; +import org.apache.isis.viewer.html.component.Block; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.DebugPane; +import org.apache.isis.viewer.html.component.ViewPane; public class LogonFormPage extends AbstractHtmlPage { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/MenuItem.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; import org.apache.isis.core.metamodel.spec.feature.ObjectActionType; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Component; public class MenuItem implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ObjectIcon.java Tue Nov 16 18:41:06 2010 @@ -18,14 +18,14 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.image.ImageLookup; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.image.ImageLookup; +import org.apache.isis.viewer.html.request.Request; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Row.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.ComponentComposite; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.ComponentComposite; class Row extends ComponentComposite { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ServiceComponent.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.image.ImageLookup; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.image.ImageLookup; public class ServiceComponent implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Span.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Component; public class Span implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/Submenu.java Tue Nov 16 18:41:06 2010 @@ -18,11 +18,11 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Component; public class Submenu implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TableHeader.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.ComponentComposite; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.ComponentComposite; class TableHeader extends ComponentComposite { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/TextBlock.java Tue Nov 16 18:41:06 2010 @@ -18,11 +18,11 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.ComponentAbstract; +import org.apache.isis.viewer.html.component.ComponentAbstract; class TextBlock extends ComponentAbstract { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/UserSwapLink.java Tue Nov 16 18:41:06 2010 @@ -21,11 +21,11 @@ /** * */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Component; final class UserSwapLink implements Component { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/ViewDiv.java Tue Nov 16 18:41:06 2010 @@ -18,16 +18,16 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.ComponentComposite; -import org.apache.isis.extensions.html.component.ViewPane; -import org.apache.isis.extensions.html.image.ImageLookup; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.ComponentComposite; +import org.apache.isis.viewer.html.component.ViewPane; +import org.apache.isis.viewer.html.image.ImageLookup; public class ViewDiv extends ComponentComposite implements ViewPane { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/component/html/WebViewerException.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.component.html; +package org.apache.isis.viewer.html.component.html; import org.apache.isis.core.commons.exceptions.IsisException; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/CollectionMapping.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import java.util.Enumeration; import java.util.Vector; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/Context.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import java.util.ArrayList; import java.util.Enumeration; @@ -42,15 +42,15 @@ import org.apache.isis.core.runtime.cont import org.apache.isis.core.runtime.persistence.ConcurrencyException; import org.apache.isis.core.runtime.persistence.adaptermanager.AdapterManager; 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; -import org.apache.isis.extensions.html.crumb.Crumb; -import org.apache.isis.extensions.html.crumb.ObjectCrumb; -import org.apache.isis.extensions.html.crumb.ObjectFieldCrumb; -import org.apache.isis.extensions.html.crumb.TaskCrumb; -import org.apache.isis.extensions.html.request.Request; -import org.apache.isis.extensions.html.task.Task; +import org.apache.isis.viewer.html.component.Block; +import org.apache.isis.viewer.html.component.ComponentFactory; +import org.apache.isis.viewer.html.crumb.CollectionCrumb; +import org.apache.isis.viewer.html.crumb.Crumb; +import org.apache.isis.viewer.html.crumb.ObjectCrumb; +import org.apache.isis.viewer.html.crumb.ObjectFieldCrumb; +import org.apache.isis.viewer.html.crumb.TaskCrumb; +import org.apache.isis.viewer.html.request.Request; +import org.apache.isis.viewer.html.task.Task; public class Context { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/HistoryEntry.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; public class HistoryEntry { public static final int OBJECT = 1; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectHistory.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import java.util.ArrayList; import java.util.Iterator; @@ -30,8 +30,8 @@ import org.apache.isis.core.commons.exce import org.apache.isis.core.commons.exceptions.UnknownTypeException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.extensions.html.component.Block; -import org.apache.isis.extensions.html.component.Component; +import org.apache.isis.viewer.html.component.Block; +import org.apache.isis.viewer.html.component.Component; public class ObjectHistory { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectLookupException.java Tue Nov 16 18:41:06 2010 @@ -18,9 +18,9 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; -import org.apache.isis.extensions.html.action.ActionException; +import org.apache.isis.viewer.html.action.ActionException; public class ObjectLookupException extends ActionException { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/ObjectMapping.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/PersistentObjectMapping.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.ensure.Assert; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/context/TransientObjectMapping.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.context; +package org.apache.isis.viewer.html.context; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.ensure.Assert; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/CollectionCrumb.java Tue Nov 16 18:41:06 2010 @@ -18,13 +18,13 @@ */ -package org.apache.isis.extensions.html.crumb; +package org.apache.isis.viewer.html.crumb; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.extensions.html.request.ForwardRequest; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.request.ForwardRequest; +import org.apache.isis.viewer.html.request.Request; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/Crumb.java Tue Nov 16 18:41:06 2010 @@ -18,10 +18,10 @@ */ -package org.apache.isis.extensions.html.crumb; +package org.apache.isis.viewer.html.crumb; import org.apache.isis.core.commons.debug.DebugString; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.request.Request; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectCrumb.java Tue Nov 16 18:41:06 2010 @@ -18,13 +18,13 @@ */ -package org.apache.isis.extensions.html.crumb; +package org.apache.isis.viewer.html.crumb; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.lang.ToString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; -import org.apache.isis.extensions.html.request.ForwardRequest; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.request.ForwardRequest; +import org.apache.isis.viewer.html.request.Request; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/ObjectFieldCrumb.java Tue Nov 16 18:41:06 2010 @@ -18,12 +18,12 @@ */ -package org.apache.isis.extensions.html.crumb; +package org.apache.isis.viewer.html.crumb; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.exceptions.NotYetImplementedException; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.request.Request; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/crumb/TaskCrumb.java Tue Nov 16 18:41:06 2010 @@ -18,13 +18,13 @@ */ -package org.apache.isis.extensions.html.crumb; +package org.apache.isis.viewer.html.crumb; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.commons.lang.ToString; -import org.apache.isis.extensions.html.request.ForwardRequest; -import org.apache.isis.extensions.html.request.Request; -import org.apache.isis.extensions.html.task.Task; +import org.apache.isis.viewer.html.request.ForwardRequest; +import org.apache.isis.viewer.html.request.Request; +import org.apache.isis.viewer.html.task.Task; public class TaskCrumb implements Crumb { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageLookup.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProvider.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderAbstract.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import java.util.HashMap; import java.util.Iterator; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBased.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import java.io.File; import java.io.FilenameFilter; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderDirectoryBasedReworked.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import java.io.File; import java.io.FilenameFilter; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/image/ImageProviderResourceBased.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.image; +package org.apache.isis.viewer.html.image; import java.util.ArrayList; import java.util.Arrays; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ForwardRequest.java Tue Nov 16 18:41:06 2010 @@ -18,9 +18,9 @@ */ -package org.apache.isis.extensions.html.request; +package org.apache.isis.viewer.html.request; -import org.apache.isis.extensions.html.task.Task; +import org.apache.isis.viewer.html.task.Task; public class ForwardRequest implements Request { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/Request.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.request; +package org.apache.isis.viewer.html.request; /** * The Request object represents all the information collected from the user when requesting the server do Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/request/ServletRequest.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.request; +package org.apache.isis.viewer.html.request; import javax.servlet.http.HttpServletRequest; Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/ControllerServlet.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/ControllerServlet.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.servlet; +package org.apache.isis.viewer.html.servlet; import java.io.IOException; import java.io.PrintWriter; @@ -34,12 +34,12 @@ import org.apache.log4j.Logger; import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.config.IsisConfiguration; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.component.html.HtmlComponentFactory; -import org.apache.isis.extensions.html.context.Context; -import org.apache.isis.extensions.html.request.Request; -import org.apache.isis.extensions.html.request.ServletRequest; -import org.apache.isis.extensions.html.servlet.internal.WebController; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.component.html.HtmlComponentFactory; +import org.apache.isis.viewer.html.context.Context; +import org.apache.isis.viewer.html.request.Request; +import org.apache.isis.viewer.html.request.ServletRequest; +import org.apache.isis.viewer.html.servlet.internal.WebController; Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/HtmlServletConstants.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/HtmlServletConstants.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/HtmlServletConstants.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/HtmlServletConstants.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.servlet; +package org.apache.isis.viewer.html.servlet; import org.apache.isis.core.metamodel.authentication.AuthenticationSession; import org.apache.isis.core.metamodel.config.ConfigurationConstants; Copied: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java (from r1035720, incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java?p2=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java&p1=incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/extensions/html/servlet/LogonServlet.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/LogonServlet.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.servlet; +package org.apache.isis.viewer.html.servlet; import java.io.IOException; @@ -39,9 +39,9 @@ import org.apache.isis.core.runtime.syst import org.apache.isis.core.runtime.system.internal.monitor.Monitor; import org.apache.isis.core.webapp.WebAppConstants; import org.apache.isis.core.webapp.auth.AuthenticationSessionLookupStrategyDefault; -import org.apache.isis.extensions.html.component.html.HtmlComponentFactory; -import org.apache.isis.extensions.html.component.html.LogonFormPage; -import org.apache.isis.extensions.html.context.Context; +import org.apache.isis.viewer.html.component.html.HtmlComponentFactory; +import org.apache.isis.viewer.html.component.html.LogonFormPage; +import org.apache.isis.viewer.html.context.Context; public class LogonServlet extends HttpServlet { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/servlet/internal/WebController.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.servlet.internal; +package org.apache.isis.viewer.html.servlet.internal; import java.util.HashMap; import java.util.Iterator; @@ -37,35 +37,35 @@ import org.apache.isis.core.runtime.pers import org.apache.isis.core.runtime.system.internal.monitor.Monitor; 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; -import org.apache.isis.extensions.html.action.LogOut; -import org.apache.isis.extensions.html.action.Welcome; -import org.apache.isis.extensions.html.action.edit.AddItemToCollection; -import org.apache.isis.extensions.html.action.edit.EditObject; -import org.apache.isis.extensions.html.action.edit.RemoveItemFromCollection; -import org.apache.isis.extensions.html.action.edit.Save; -import org.apache.isis.extensions.html.action.misc.About; -import org.apache.isis.extensions.html.action.misc.SetUser; -import org.apache.isis.extensions.html.action.misc.SwapUser; -import org.apache.isis.extensions.html.action.view.CollectionView; -import org.apache.isis.extensions.html.action.view.FieldCollectionView; -import org.apache.isis.extensions.html.action.view.ObjectView; -import org.apache.isis.extensions.html.action.view.ServiceView; -import org.apache.isis.extensions.html.component.Block; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.ComponentFactory; -import org.apache.isis.extensions.html.component.DebugPane; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.context.Context; -import org.apache.isis.extensions.html.context.ObjectLookupException; -import org.apache.isis.extensions.html.crumb.Crumb; -import org.apache.isis.extensions.html.image.ImageLookup; -import org.apache.isis.extensions.html.request.Request; -import org.apache.isis.extensions.html.task.InvokeMethod; -import org.apache.isis.extensions.html.task.TaskLookupException; -import org.apache.isis.extensions.html.task.TaskStep; +import org.apache.isis.viewer.html.action.Action; +import org.apache.isis.viewer.html.action.ActionException; +import org.apache.isis.viewer.html.action.ChangeContext; +import org.apache.isis.viewer.html.action.LogOut; +import org.apache.isis.viewer.html.action.Welcome; +import org.apache.isis.viewer.html.action.edit.AddItemToCollection; +import org.apache.isis.viewer.html.action.edit.EditObject; +import org.apache.isis.viewer.html.action.edit.RemoveItemFromCollection; +import org.apache.isis.viewer.html.action.edit.Save; +import org.apache.isis.viewer.html.action.misc.About; +import org.apache.isis.viewer.html.action.misc.SetUser; +import org.apache.isis.viewer.html.action.misc.SwapUser; +import org.apache.isis.viewer.html.action.view.CollectionView; +import org.apache.isis.viewer.html.action.view.FieldCollectionView; +import org.apache.isis.viewer.html.action.view.ObjectView; +import org.apache.isis.viewer.html.action.view.ServiceView; +import org.apache.isis.viewer.html.component.Block; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.ComponentFactory; +import org.apache.isis.viewer.html.component.DebugPane; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; +import org.apache.isis.viewer.html.context.ObjectLookupException; +import org.apache.isis.viewer.html.crumb.Crumb; +import org.apache.isis.viewer.html.image.ImageLookup; +import org.apache.isis.viewer.html.request.Request; +import org.apache.isis.viewer.html.task.InvokeMethod; +import org.apache.isis.viewer.html.task.TaskLookupException; +import org.apache.isis.viewer.html.task.TaskStep; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/AddItemToCollectionTask.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.consent.Consent; @@ -27,8 +27,8 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.util.CollectionFacetUtils; import org.apache.isis.core.runtime.context.IsisContext; import org.apache.isis.core.runtime.persistence.PersistenceSession; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.context.Context; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/EditTask.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; @@ -35,8 +35,8 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.util.IsisUtils; import org.apache.isis.core.runtime.context.IsisContext; import org.apache.isis.core.runtime.persistence.PersistenceSession; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.context.Context; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; public class EditTask extends Task { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/InvokeMethod.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import java.util.List; @@ -30,12 +30,12 @@ import org.apache.isis.core.metamodel.sp 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.viewer.html.action.Action; +import org.apache.isis.viewer.html.action.ActionException; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; +import org.apache.isis.viewer.html.request.ForwardRequest; +import org.apache.isis.viewer.html.request.Request; public final class InvokeMethod implements Action { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/MethodTask.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import java.util.List; @@ -30,8 +30,8 @@ import org.apache.isis.core.metamodel.sp 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.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/Task.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import org.apache.isis.core.commons.debug.DebugString; import org.apache.isis.core.metamodel.adapter.InvalidEntryException; @@ -29,9 +29,9 @@ import org.apache.isis.core.metamodel.sp import org.apache.isis.core.metamodel.spec.SpecificationFacets; import org.apache.isis.core.progmodel.facets.value.PasswordValueFacet; import org.apache.isis.core.runtime.context.IsisContext; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.context.Context; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.context.Context; +import org.apache.isis.viewer.html.request.Request; /** Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskLookupException.java Tue Nov 16 18:41:06 2010 @@ -18,9 +18,9 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; -import org.apache.isis.extensions.html.action.ActionException; +import org.apache.isis.viewer.html.action.ActionException; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/task/TaskStep.java Tue Nov 16 18:41:06 2010 @@ -18,19 +18,19 @@ */ -package org.apache.isis.extensions.html.task; +package org.apache.isis.viewer.html.task; import org.apache.isis.core.commons.exceptions.IsisException; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.spec.ObjectSpecification; -import org.apache.isis.extensions.html.action.Action; -import org.apache.isis.extensions.html.action.ActionException; -import org.apache.isis.extensions.html.component.Component; -import org.apache.isis.extensions.html.component.Form; -import org.apache.isis.extensions.html.component.Page; -import org.apache.isis.extensions.html.component.ViewPane; -import org.apache.isis.extensions.html.context.Context; -import org.apache.isis.extensions.html.request.Request; +import org.apache.isis.viewer.html.action.Action; +import org.apache.isis.viewer.html.action.ActionException; +import org.apache.isis.viewer.html.component.Component; +import org.apache.isis.viewer.html.component.Form; +import org.apache.isis.viewer.html.component.Page; +import org.apache.isis.viewer.html.component.ViewPane; +import org.apache.isis.viewer.html.context.Context; +import org.apache.isis.viewer.html.request.Request; public final class TaskStep implements Action { Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerConstants.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.viewer; +package org.apache.isis.viewer.html.viewer; import org.apache.isis.core.metamodel.config.ConfigurationConstants; Modified: incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java?rev=1035738&r1=1035720&r2=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java (original) +++ incubator/isis/trunk/viewer/html/src/main/java/org/apache/isis/viewer/html/viewer/HtmlViewerInstaller.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.html.viewer; +package org.apache.isis.viewer.html.viewer; import org.apache.isis.core.commons.lang.MapUtils; import org.apache.isis.core.runtime.Isis; @@ -29,9 +29,9 @@ import org.apache.isis.core.runtime.web. 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.viewer.html.servlet.ControllerServlet; +import org.apache.isis.viewer.html.servlet.HtmlServletConstants; +import org.apache.isis.viewer.html.servlet.LogonServlet; /** Copied: incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java (from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextSessionDataTest.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java?p2=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java&p1=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextSessionDataTest.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextSessionDataTest.java (original) +++ incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextSessionDataTest.java Tue Nov 16 18:41:06 2010 @@ -18,14 +18,14 @@ */ -package org.apache.isis.extensions.htmlviewer.request; +package org.apache.isis.viewer.html.context; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; import org.apache.isis.core.metamodel.adapter.ResolveState; import org.apache.isis.core.metamodel.adapter.oid.Oid; import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase; import org.apache.isis.core.runtime.testsystem.TestPojo; -import org.apache.isis.extensions.html.context.Context; +import org.apache.isis.viewer.html.context.Context; public class ContextSessionDataTest extends ProxyJunit3TestCase { Copied: incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java (from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextTest.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java?p2=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java&p1=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextTest.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/request/ContextTest.java (original) +++ incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/context/ContextTest.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.htmlviewer.request; +package org.apache.isis.viewer.html.context; import org.apache.isis.core.metamodel.adapter.ObjectActionNoop; import org.apache.isis.core.metamodel.adapter.ObjectAdapter; @@ -27,8 +27,8 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.runtime.testsystem.ProxyJunit3TestCase; import org.apache.isis.core.runtime.testsystem.TestProxyCollectionAdapter; import org.apache.isis.core.runtime.testsystem.TestProxyVersion; -import org.apache.isis.extensions.html.action.ActionException; -import org.apache.isis.extensions.html.context.Context; +import org.apache.isis.viewer.html.action.ActionException; +import org.apache.isis.viewer.html.context.Context; public class ContextTest extends ProxyJunit3TestCase { Copied: incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java (from r1035720, incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/ImageProviderResourceBasedTest.java) URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java?p2=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java&p1=incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/ImageProviderResourceBasedTest.java&r1=1035720&r2=1035738&rev=1035738&view=diff ============================================================================== --- incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/extensions/htmlviewer/component/ImageProviderResourceBasedTest.java (original) +++ incubator/isis/trunk/viewer/html/src/test/java/org/apache/isis/viewer/html/request/ImageProviderResourceBasedTest.java Tue Nov 16 18:41:06 2010 @@ -18,7 +18,7 @@ */ -package org.apache.isis.extensions.htmlviewer.component; +package org.apache.isis.viewer.html.request; import static org.hamcrest.CoreMatchers.equalTo; import static org.junit.Assert.assertThat; @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTha import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.apache.isis.extensions.html.image.ImageProviderResourceBased; +import org.apache.isis.viewer.html.image.ImageProviderResourceBased; public class ImageProviderResourceBasedTest {