You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/06/26 17:24:19 UTC

svn commit: r1139812 [2/3] - in /incubator/isis/trunk/viewer/xhtml: applib/src/main/java/org/apache/isis/viewer/restful/applib/ applib/src/main/java/org/apache/isis/viewer/restful/applib/providers/ applib/src/main/java/org/apache/isis/viewer/restful/ap...

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/ResourceAbstract.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/ResourceAbstract.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/ResourceAbstract.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/ResourceAbstract.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources;
+package org.apache.isis.viewer.xhtml.viewer.resources;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -52,20 +52,20 @@ import org.apache.isis.runtimes.dflt.run
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.AdapterManager;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
 import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
-import org.apache.isis.viewer.restful.viewer.facets.TableColumnFacetDisabling;
-import org.apache.isis.viewer.restful.viewer.facets.TableColumnFacetFacetType;
-import org.apache.isis.viewer.restful.viewer.facets.TableColumnFacetHiding;
-import org.apache.isis.viewer.restful.viewer.facets.TableColumnFacetImplementation;
-import org.apache.isis.viewer.restful.viewer.facets.TableColumnFacetValidating;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Attribute;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.util.OidUtils;
-import org.apache.isis.viewer.restful.viewer.xom.DtDd;
-import org.apache.isis.viewer.restful.viewer.xom.ElementBuilder;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-import org.apache.isis.viewer.restful.viewer.xom.TableColumn;
-import org.apache.isis.viewer.restful.viewer.xom.XhtmlRenderer;
+import org.apache.isis.viewer.xhtml.viewer.facets.TableColumnFacetDisabling;
+import org.apache.isis.viewer.xhtml.viewer.facets.TableColumnFacetFacetType;
+import org.apache.isis.viewer.xhtml.viewer.facets.TableColumnFacetHiding;
+import org.apache.isis.viewer.xhtml.viewer.facets.TableColumnFacetImplementation;
+import org.apache.isis.viewer.xhtml.viewer.facets.TableColumnFacetValidating;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Attribute;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.util.OidUtils;
+import org.apache.isis.viewer.xhtml.viewer.xom.DtDd;
+import org.apache.isis.viewer.xhtml.viewer.xom.ElementBuilder;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.xom.TableColumn;
+import org.apache.isis.viewer.xhtml.viewer.xom.XhtmlRenderer;
 
 public abstract class ResourceAbstract {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/ObjectResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/ObjectResourceImpl.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/ObjectResourceImpl.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/ObjectResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/ObjectResourceImpl.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import java.io.InputStream;
 import java.text.MessageFormat;
@@ -45,34 +45,34 @@ 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.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.restful.applib.resources.ObjectResource;
-import org.apache.isis.viewer.restful.viewer.Constants;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
-import org.apache.isis.viewer.restful.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionInvoke;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionName;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionParamCount;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionRealTarget;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionReturnType;
-import org.apache.isis.viewer.restful.viewer.resources.objects.actions.TableColumnNakedObjectActionType;
-import org.apache.isis.viewer.restful.viewer.resources.objects.collections.TableColumnOneToManyAssociationAccess;
-import org.apache.isis.viewer.restful.viewer.resources.objects.collections.TableColumnOneToManyAssociationAddTo;
-import org.apache.isis.viewer.restful.viewer.resources.objects.collections.TableColumnOneToManyAssociationInvalidReason;
-import org.apache.isis.viewer.restful.viewer.resources.objects.collections.TableColumnOneToManyAssociationName;
-import org.apache.isis.viewer.restful.viewer.resources.objects.collections.TableColumnOneToManyAssociationRemoveFrom;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationAccess;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationClear;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationInvalidReason;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationModify;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationName;
-import org.apache.isis.viewer.restful.viewer.resources.objects.properties.TableColumnOneToOneAssociationParseable;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.util.ActionUtils;
-import org.apache.isis.viewer.restful.viewer.util.InputStreamUtil;
-import org.apache.isis.viewer.restful.viewer.util.ListUtils;
-import org.apache.isis.viewer.restful.viewer.util.UrlDecoderUtils;
-import org.apache.isis.viewer.restful.viewer.xom.TableColumn;
+import org.apache.isis.viewer.xhtml.applib.resources.ObjectResource;
+import org.apache.isis.viewer.xhtml.viewer.Constants;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.html.XhtmlTemplate;
+import org.apache.isis.viewer.xhtml.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionInvoke;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionName;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionParamCount;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionRealTarget;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionReturnType;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.actions.TableColumnNakedObjectActionType;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.collections.TableColumnOneToManyAssociationAccess;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.collections.TableColumnOneToManyAssociationAddTo;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.collections.TableColumnOneToManyAssociationInvalidReason;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.collections.TableColumnOneToManyAssociationName;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.collections.TableColumnOneToManyAssociationRemoveFrom;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationAccess;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationClear;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationInvalidReason;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationModify;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationName;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.properties.TableColumnOneToOneAssociationParseable;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.util.ActionUtils;
+import org.apache.isis.viewer.xhtml.viewer.util.InputStreamUtil;
+import org.apache.isis.viewer.xhtml.viewer.util.ListUtils;
+import org.apache.isis.viewer.xhtml.viewer.util.UrlDecoderUtils;
+import org.apache.isis.viewer.xhtml.viewer.xom.TableColumn;
 
 /**
  * Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociation.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociation.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociation.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociation.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociation.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociation.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociation.java Sun Jun 26 15:24:14 2011
@@ -16,12 +16,12 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public abstract class TableColumnNakedObjectAssociation<T extends ObjectAssociation> extends
     TableColumnNakedObjectMember<T> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationModifyAbstract.java Sun Jun 26 15:24:14 2011
@@ -16,16 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.tree.Attribute;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.tree.Attribute;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public abstract class TableColumnNakedObjectAssociationModifyAbstract<T extends ObjectAssociation> extends
     TableColumnNakedObjectAssociation<T> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationType.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationType.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationType.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectAssociationType.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectAssociationType.java Sun Jun 26 15:24:14 2011
@@ -16,16 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectAssociationType<T extends ObjectAssociation> extends
     TableColumnNakedObjectAssociation<T> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMember.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMember.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMember.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMember.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMember.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
-import org.apache.isis.viewer.restful.viewer.xom.TableColumnAbstract;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.xom.TableColumnAbstract;
 
 public abstract class TableColumnNakedObjectMember<T extends ObjectMember> extends TableColumnAbstract<T> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabled.java Sun Jun 26 15:24:14 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectMemberDisabled<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberDisabledReason.java Sun Jun 26 15:24:14 2011
@@ -16,15 +16,15 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectMemberDisabledReason<T extends ObjectMember> extends
     TableColumnNakedObjectMember<T> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberHidden.java Sun Jun 26 15:24:14 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectMemberHidden<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberInvalidReason.java Sun Jun 26 15:24:14 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public abstract class TableColumnNakedObjectMemberInvalidReason<T extends ObjectMember> extends
     TableColumnNakedObjectMember<T> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberName.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberName.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberName.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/TableColumnNakedObjectMemberName.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/TableColumnNakedObjectMemberName.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public abstract class TableColumnNakedObjectMemberName<T extends ObjectMember> extends TableColumnNakedObjectMember<T> {
     private final ObjectSpecification noSpec;

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectAction.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectAction.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectAction.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectAction.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectAction.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMember;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMember;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public abstract class TableColumnNakedObjectAction extends TableColumnNakedObjectMember<ObjectAction> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvalidReason.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionInvalidReason extends
     TableColumnNakedObjectMemberInvalidReason<ObjectAction> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionInvoke.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -26,10 +26,10 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
 import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Attribute;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Attribute;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionInvoke extends TableColumnNakedObjectAction {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionName.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import java.text.MessageFormat;
 
@@ -24,10 +24,10 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberName;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public class TableColumnNakedObjectActionName extends TableColumnNakedObjectMemberName<ObjectAction> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionParamCount.java Sun Jun 26 15:24:14 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionParamCount extends TableColumnNakedObjectAction {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionRealTarget.java Sun Jun 26 15:24:14 2011
@@ -16,16 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionRealTarget extends TableColumnNakedObjectAction {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionReturnType.java Sun Jun 26 15:24:14 2011
@@ -16,16 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionReturnType extends TableColumnNakedObjectAction {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/actions/TableColumnNakedObjectActionType.java Sun Jun 26 15:24:14 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.actions;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.actions;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnNakedObjectActionType extends TableColumnNakedObjectAction {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAccess.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.collections;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociation;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToManyAssociationAccess extends
     TableColumnNakedObjectAssociation<OneToManyAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationAddTo.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.collections;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.xhtml.viewer.util.StringUtil;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToManyAssociationAddTo extends
     TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationInvalidReason.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.collections;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToManyAssociationInvalidReason extends
     TableColumnNakedObjectMemberInvalidReason<OneToManyAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationName.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.collections;
 
 import java.text.MessageFormat;
 
@@ -24,10 +24,10 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberName;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public class TableColumnOneToManyAssociationName extends TableColumnNakedObjectMemberName<OneToManyAssociation> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/collections/TableColumnOneToManyAssociationRemoveFrom.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.collections;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.collections;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.xhtml.viewer.util.StringUtil;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToManyAssociationRemoveFrom extends
     TableColumnNakedObjectAssociationModifyAbstract<OneToManyAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationAccess.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import java.text.MessageFormat;
 
@@ -26,10 +26,10 @@ import org.apache.isis.core.metamodel.ad
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociation;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToOneAssociationAccess extends TableColumnNakedObjectAssociation<OneToOneAssociation> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationClear.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.xhtml.viewer.util.StringUtil;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToOneAssociationClear extends
     TableColumnNakedObjectAssociationModifyAbstract<OneToOneAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationInvalidReason.java Sun Jun 26 15:24:14 2011
@@ -16,13 +16,13 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberInvalidReason;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToOneAssociationInvalidReason extends
     TableColumnNakedObjectMemberInvalidReason<OneToOneAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationModify.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import java.text.MessageFormat;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
-import org.apache.isis.viewer.restful.viewer.util.StringUtil;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociationModifyAbstract;
+import org.apache.isis.viewer.xhtml.viewer.util.StringUtil;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToOneAssociationModify extends
     TableColumnNakedObjectAssociationModifyAbstract<OneToOneAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationName.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import java.text.MessageFormat;
 
@@ -24,10 +24,10 @@ import org.apache.isis.core.commons.auth
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectMemberName;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectMemberName;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public class TableColumnOneToOneAssociationName extends TableColumnNakedObjectMemberName<OneToOneAssociation> {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/objects/properties/TableColumnOneToOneAssociationParseable.java Sun Jun 26 15:24:14 2011
@@ -16,16 +16,16 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.objects.properties;
+package org.apache.isis.viewer.xhtml.viewer.resources.objects.properties;
 
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
 import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.resources.objects.TableColumnNakedObjectAssociation;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.xom.ResourceContext;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.resources.objects.TableColumnNakedObjectAssociation;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.xom.ResourceContext;
 
 public final class TableColumnOneToOneAssociationParseable extends
     TableColumnNakedObjectAssociation<OneToOneAssociation> {

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/services/ServicesResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/services/ServicesResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/services/ServicesResourceImpl.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/services/ServicesResourceImpl.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/services/ServicesResourceImpl.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/services/ServicesResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/services/ServicesResourceImpl.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.services;
+package org.apache.isis.viewer.xhtml.viewer.resources.services;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -24,11 +24,11 @@ import java.util.List;
 import javax.ws.rs.Path;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.restful.applib.resources.ServicesResource;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
-import org.apache.isis.viewer.restful.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.applib.resources.ServicesResource;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.html.XhtmlTemplate;
+import org.apache.isis.viewer.xhtml.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
 
 /**
  * Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/specs/SpecsResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/specs/SpecsResourceImpl.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/specs/SpecsResourceImpl.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/specs/SpecsResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/specs/SpecsResourceImpl.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.specs;
+package org.apache.isis.viewer.xhtml.viewer.resources.specs;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.InvocationTargetException;
@@ -37,12 +37,12 @@ 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.runtimes.dflt.runtime.system.context.IsisContext;
-import org.apache.isis.viewer.restful.applib.resources.SpecsResource;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
-import org.apache.isis.viewer.restful.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
-import org.apache.isis.viewer.restful.viewer.util.ActionUtils;
+import org.apache.isis.viewer.xhtml.applib.resources.SpecsResource;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.html.XhtmlTemplate;
+import org.apache.isis.viewer.xhtml.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.viewer.util.ActionUtils;
 
 import com.google.common.collect.Lists;
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/user/UserResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/user/UserResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/user/UserResourceImpl.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/user/UserResourceImpl.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/user/UserResourceImpl.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/resources/user/UserResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/resources/user/UserResourceImpl.java Sun Jun 26 15:24:14 2011
@@ -16,17 +16,17 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.resources.user;
+package org.apache.isis.viewer.xhtml.viewer.resources.user;
 
 import java.util.List;
 
 import javax.ws.rs.Path;
 
-import org.apache.isis.viewer.restful.applib.resources.UserResource;
-import org.apache.isis.viewer.restful.viewer.html.HtmlClass;
-import org.apache.isis.viewer.restful.viewer.html.XhtmlTemplate;
-import org.apache.isis.viewer.restful.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer.tree.Element;
+import org.apache.isis.viewer.xhtml.applib.resources.UserResource;
+import org.apache.isis.viewer.xhtml.viewer.html.HtmlClass;
+import org.apache.isis.viewer.xhtml.viewer.html.XhtmlTemplate;
+import org.apache.isis.viewer.xhtml.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.xhtml.viewer.tree.Element;
 
 /**
  * Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Attribute.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Attribute.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Attribute.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Attribute.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Attribute.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Attribute.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Attribute.java Sun Jun 26 15:24:14 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.viewer.restful.viewer.tree;
+package org.apache.isis.viewer.xhtml.viewer.tree;
 
 public class Attribute {
     

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Element.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Element.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Element.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Element.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Element.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/tree/Element.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/tree/Element.java Sun Jun 26 15:24:14 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.isis.viewer.restful.viewer.tree;
+package org.apache.isis.viewer.xhtml.viewer.tree;
 
 public class Element {
 

Copied: incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/util/ActionUtils.java (from r1139802, incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/util/ActionUtils.java?p2=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/util/ActionUtils.java&p1=incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java&r1=1139802&r2=1139812&rev=1139812&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/restful/viewer/util/ActionUtils.java (original)
+++ incubator/isis/trunk/viewer/xhtml/viewer/src/main/java/org/apache/isis/viewer/xhtml/viewer/util/ActionUtils.java Sun Jun 26 15:24:14 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer.util;
+package org.apache.isis.viewer.xhtml.viewer.util;
 
 import java.util.List;