You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2010/10/27 19:00:32 UTC
svn commit: r1028037 [12/13] - in /incubator/isis/trunk: alternatives/
alternatives/embedded/ alternatives/embedded/src/docbkx/
alternatives/embedded/src/docbkx/guide/
alternatives/embedded/src/docbkx/guide/images/
alternatives/embedded/src/main/java/o...
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanelFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanelFactory.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.scalars.wizardpagedesc;
+package org.apache.isis.viewer.wicket.ui.components.scalars.wizardpagedesc;
-import org.apache.isis.extensions.wicket.metamodel.facets.WizardPageDescriptionFacet;
-import org.apache.isis.extensions.wicket.model.models.ScalarModel;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
+import org.apache.isis.viewer.wicket.metamodel.wizardpagedesc.WizardPageDescriptionFacet;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/value/StandaloneValuePanelFactory.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.value;
+package org.apache.isis.viewer.wicket.ui.components.value;
import org.apache.isis.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.extensions.wicket.model.models.ScalarModel;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.voidreturn;
+package org.apache.isis.viewer.wicket.ui.components.voidreturn;
import org.apache.isis.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanel.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.welcome;
+package org.apache.isis.viewer.wicket.ui.components.welcome;
-import org.apache.isis.extensions.wicket.model.models.WelcomeModel;
-import org.apache.isis.extensions.wicket.ui.pages.home.HomePage;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
+import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.basic.Label;
/**
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.welcome;
+package org.apache.isis.viewer.wicket.ui.components.welcome;
-import org.apache.isis.extensions.wicket.model.models.WelcomeModel;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ContainedButton.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.buttons;
+package org.apache.isis.viewer.wicket.ui.components.widgets.buttons;
import java.util.List;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/buttons/ToggleButtonsPanel.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.buttons;
+package org.apache.isis.viewer.wicket.ui.components.widgets.buttons;
import java.io.Serializable;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.Component;
/**
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuBuilder.java Wed Oct 27 17:00:06 2010
@@ -18,22 +18,22 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.util.Actions;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuPanel.Style;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.actions.notcontributed.NotContributedFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.util.Actions;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem.Builder;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuPanel.Style;
import org.apache.wicket.Application;
import com.google.common.collect.Collections2;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import static org.hamcrest.CoreMatchers.is;
@@ -27,16 +27,16 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.commons.ensure.Ensure;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory.LinkAndLabel;
-import org.apache.isis.extensions.wicket.ui.pages.PageAbstract;
-import org.apache.isis.extensions.wicket.ui.util.Components;
-import org.apache.isis.extensions.wicket.ui.util.CssClassAppender;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.metamodel.consent.Consent;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory.LinkAndLabel;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.wicket.Application;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanel.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import org.apache.wicket.model.Model;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItemPanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuLinkFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuLinkFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuLinkFactory.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.io.Serializable;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.wicket.markup.html.link.Link;
/**
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.util.Strings;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuPanel.Style;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.extensions.wicket.ui.util.CssClassAppender;
+import org.apache.isis.viewer.wicket.model.util.Strings;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuPanel.Style;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.util.ListModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssSubMenuItemsPanel.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import java.util.List;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/dropdownchoices/DropDownChoicesForObjectAdapterMementos.java Wed Oct 27 17:00:06 2010
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.dropdownchoices;
+package org.apache.isis.viewer.wicket.ui.components.widgets.dropdownchoices;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLink.java Wed Oct 27 17:00:06 2010
@@ -18,29 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.entitylink;
+package org.apache.isis.viewer.wicket.ui.components.widgets.entitylink;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.model.models.ScalarModel;
-import org.apache.isis.extensions.wicket.model.util.Generics;
-import org.apache.isis.extensions.wicket.model.util.Mementos;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.components.actions.ActionInvokeHandler;
-import org.apache.isis.extensions.wicket.ui.components.actions.ActionPanel;
-import org.apache.isis.extensions.wicket.ui.components.entity.combined.EntityCombinedPanel;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuBuilder;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuPanel;
-import org.apache.isis.extensions.wicket.ui.components.widgets.dropdownchoices.DropDownChoicesForObjectAdapterMementos;
-import org.apache.isis.extensions.wicket.ui.components.widgets.formcomponent.CancelHintRequired;
-import org.apache.isis.extensions.wicket.ui.components.widgets.formcomponent.FormComponentPanelAbstract;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
-import org.apache.isis.extensions.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.facets.object.ident.icon.IconFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
@@ -48,6 +30,24 @@ import org.apache.isis.metamodel.spec.fe
import org.apache.isis.metamodel.spec.feature.ObjectActionType;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.system.DeploymentType;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.model.util.Generics;
+import org.apache.isis.viewer.wicket.model.util.Mementos;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.actions.ActionInvokeHandler;
+import org.apache.isis.viewer.wicket.ui.components.actions.ActionPanel;
+import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuBuilder;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuPanel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.dropdownchoices.DropDownChoicesForObjectAdapterMementos;
+import org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent.CancelHintRequired;
+import org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent.FormComponentPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.extensions.yui.calendar.DateField;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkFactory.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.entitylink;
+package org.apache.isis.viewer.wicket.ui.components.widgets.entitylink;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.ui.ComponentFactoryAbstract;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
import org.apache.isis.metamodel.facets.object.value.ValueFacet;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/FindUsingLinkFactory.java Wed Oct 27 17:00:06 2010
@@ -18,18 +18,18 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.entitylink;
+package org.apache.isis.viewer.wicket.ui.components.widgets.entitylink;
-import org.apache.isis.extensions.wicket.model.common.NoResultsHandler;
-import org.apache.isis.extensions.wicket.model.common.SelectionHandler;
-import org.apache.isis.extensions.wicket.model.mementos.ActionMemento;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.model.models.ActionModel.SingleResultsMode;
-import org.apache.isis.extensions.wicket.model.util.Actions;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.wicket.model.common.NoResultsHandler;
+import org.apache.isis.viewer.wicket.model.common.SelectionHandler;
+import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.model.models.ActionModel.SingleResultsMode;
+import org.apache.isis.viewer.wicket.model.util.Actions;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.link.Link;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/CancelHintRequired.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.formcomponent;
+package org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormComponentPanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,25 +18,25 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.formcomponent;
+package org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.extensions.wicket.model.nof.PersistenceSessionAccessor;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCache;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCacheAccessor;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.extensions.wicket.ui.util.Components;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.model.nof.PersistenceSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCache;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCacheAccessor;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Session;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/formcomponent/FormFeedbackPanel.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.components.widgets.formcomponent;
+package org.apache.isis.viewer.wicket.ui.components.widgets.formcomponent;
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageAbstract.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageAbstract.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,23 +18,23 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.models.ApplicationActionsModel;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.metamodel.services.ServicesInjector;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.viewer.wicket.model.models.ApplicationActionsModel;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebPage;
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassList.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassList.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassList.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassList.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
/**
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistry.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistry.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistry.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
import org.apache.wicket.Page;
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistryAccessor.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistryAccessor.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageClassRegistryAccessor.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageClassRegistryAccessor.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
import java.io.Serializable;
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageRegistrySpi.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageRegistrySpi.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageRegistrySpi.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageRegistrySpi.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageRegistrySpi.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageRegistrySpi.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageRegistrySpi.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
import org.apache.wicket.Page;
Copied: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageType.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageType.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/extensions/wicket/ui/pages/PageType.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageType.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages;
+package org.apache.isis.viewer.wicket.ui.pages;
-import org.apache.isis.extensions.wicket.ui.pages.action.ActionPage;
-import org.apache.isis.extensions.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.extensions.wicket.ui.pages.home.HomePage;
+import org.apache.isis.viewer.wicket.ui.pages.action.ActionPage;
+import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
+import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.WebPage;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/action/ActionPage.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages.action;
+package org.apache.isis.viewer.wicket.ui.pages.action;
-import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.PageParameters;
import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages.entity;
+package org.apache.isis.viewer.wicket.ui.pages.entity;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.pages.PageAbstract;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.PageParameters;
import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.pages.home;
+package org.apache.isis.viewer.wicket.ui.pages.home;
-import org.apache.isis.extensions.wicket.model.models.WelcomeModel;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.model.models.WelcomeModel;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.PageParameters;
import org.apache.wicket.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,21 +18,21 @@
*/
-package org.apache.isis.extensions.wicket.ui.panels;
+package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.extensions.wicket.model.nof.PersistenceSessionAccessor;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.model.nof.PersistenceSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,20 +18,20 @@
*/
-package org.apache.isis.extensions.wicket.ui.panels;
+package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.extensions.wicket.model.nof.PersistenceSessionAccessor;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.util.Components;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.persistence.PersistenceSession;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.model.nof.PersistenceSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.wicket.Component;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.Session;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/ProcessObjectPanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,21 +18,11 @@
*/
-package org.apache.isis.extensions.wicket.ui.panels;
+package org.apache.isis.viewer.wicket.ui.panels;
import java.util.List;
import org.apache.isis.commons.filters.Filter;
-import org.apache.isis.extensions.wicket.model.mementos.ActionMemento;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.mementos.PropertyMemento;
-import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.model.models.ActionModel.SingleResultsMode;
-import org.apache.isis.extensions.wicket.model.models.EntityModel;
-import org.apache.isis.extensions.wicket.model.models.ScalarModel;
-import org.apache.isis.extensions.wicket.model.util.Mementos;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.pages.action.ActionPage;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
@@ -41,6 +31,16 @@ import org.apache.isis.metamodel.spec.fe
import org.apache.isis.metamodel.spec.feature.ObjectAssociationFilters;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.runtime.memento.Memento;
+import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
+import org.apache.isis.viewer.wicket.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.model.models.EntityModel;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.model.models.ActionModel.SingleResultsMode;
+import org.apache.isis.viewer.wicket.model.util.Mementos;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.pages.action.ActionPage;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/DropDownChoiceComponentFactory.java Wed Oct 27 17:00:06 2010
@@ -21,12 +21,12 @@
/**
*
*/
-package org.apache.isis.extensions.wicket.ui.selector;
+package org.apache.isis.viewer.wicket.ui.selector;
import java.util.List;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.util.Components;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.form.DropDownChoice;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/SelectorPanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.wicket.ui.selector;
+package org.apache.isis.viewer.wicket.ui.selector;
import java.util.List;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.extensions.wicket.ui.tabs;
+package org.apache.isis.viewer.wicket.ui.tabs;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.model.IModel;
public class TabAbstract<T extends IModel<?>> extends PanelAbstract<T> {
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/tabs/TabbedPanelAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.extensions.wicket.ui.tabs;
+package org.apache.isis.viewer.wicket.ui.tabs;
-import org.apache.isis.extensions.wicket.ui.panels.PanelAbstract;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Components.java Wed Oct 27 17:00:06 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.extensions.wicket.ui.util;
+package org.apache.isis.viewer.wicket.ui.util;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/CssClassAppender.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.util;
+package org.apache.isis.viewer.wicket.ui.util;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.model.IModel;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/EvenOrOddCssClassAppenderFactory.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.util;
+package org.apache.isis.viewer.wicket.ui.util;
import org.apache.wicket.behavior.IBehavior;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/zzz/cssplaytime/CssPlaytimePage.java Wed Oct 27 17:00:06 2010
@@ -18,9 +18,9 @@
*/
-package org.apache.isis.extensions.wicket.ui.zzz.cssplaytime;
+package org.apache.isis.viewer.wicket.ui.zzz.cssplaytime;
-import org.apache.isis.extensions.wicket.ui.pages.PageAbstract;
+import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.wicket.PageParameters;
public class CssPlaytimePage extends PageAbstract {
Copied: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java (from r1026611, incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java?p2=incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java&p1=incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/extensions/wicket/ui/ComponentType_ConstantsTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentType_ConstantsTest.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,12 @@
*/
-package org.apache.isis.extensions.wicket.ui;
+package org.apache.isis.viewer.wicket.ui;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.junit.Test;
public class ComponentType_ConstantsTest {
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuUtilsTest.java Wed Oct 27 17:00:06 2010
@@ -19,7 +19,7 @@
-package org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu;
+package org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
@@ -30,12 +30,6 @@ import java.util.Collections;
import java.util.List;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.ui.fixtures.ActionFixtures;
-import org.apache.isis.extensions.wicket.ui.fixtures.AdapterFixtures;
-import org.apache.isis.extensions.wicket.ui.fixtures.Customers;
-import org.apache.isis.extensions.wicket.ui.fixtures.SpecFixtures;
-import org.apache.isis.extensions.wicket.ui.fixtures.SystemFixtures;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.runtimecontext.RuntimeContext;
@@ -43,6 +37,14 @@ import org.apache.isis.metamodel.runtime
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.apache.isis.metamodel.spec.feature.ObjectActionType;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuItem;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
+import org.apache.isis.viewer.wicket.ui.fixtures.ActionFixtures;
+import org.apache.isis.viewer.wicket.ui.fixtures.AdapterFixtures;
+import org.apache.isis.viewer.wicket.ui.fixtures.Customers;
+import org.apache.isis.viewer.wicket.ui.fixtures.SpecFixtures;
+import org.apache.isis.viewer.wicket.ui.fixtures.SystemFixtures;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.WicketTester;
import org.jmock.Mockery;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/ActionFixtures.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.fixtures;
+package org.apache.isis.viewer.wicket.ui.fixtures;
import org.apache.isis.applib.Identifier;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/AdapterFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/AdapterFixtures.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/AdapterFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/AdapterFixtures.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.fixtures;
+package org.apache.isis.viewer.wicket.ui.fixtures;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.jmock.Expectations;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/Customers.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.fixtures;
+package org.apache.isis.viewer.wicket.ui.fixtures;
public class Customers {
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SpecFixtures.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.ui.fixtures;
+package org.apache.isis.viewer.wicket.ui.fixtures;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.jmock.Expectations;
Modified: incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SystemFixtures.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SystemFixtures.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SystemFixtures.java (original)
+++ incubator/isis/trunk/viewer/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/fixtures/SystemFixtures.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,13 @@
*/
-package org.apache.isis.extensions.wicket.ui.fixtures;
+package org.apache.isis.viewer.wicket.ui.fixtures;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
import org.apache.isis.metamodel.adapter.oid.Oid;
import org.apache.isis.metamodel.adapter.oid.stringable.OidStringifier;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.ui.components.widgets.cssmenu.CssMenuLinkFactory;
import org.apache.wicket.markup.html.link.Link;
import org.jmock.Expectations;
import org.jmock.Mockery;
Copied: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/ApplicationCssUrl.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/ApplicationCssUrl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/ApplicationCssUrl.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/ApplicationCssUrl.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/ApplicationCssUrl.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/ApplicationCssUrl.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/ApplicationCssUrl.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Copied: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java Wed Oct 27 17:00:06 2010
@@ -18,36 +18,36 @@
*/
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
import java.util.ServiceLoader;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCache;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCacheAccessor;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryList;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassList;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
-import org.apache.isis.extensions.wicket.viewer.imagecache.ImageCacheClassPath;
-import org.apache.isis.extensions.wicket.viewer.integration.nof.WicketServer;
-import org.apache.isis.extensions.wicket.viewer.integration.nof.WicketServerPrototype;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
import org.apache.isis.metamodel.adapter.ObjectAdapter;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.runner.IsisModule;
import org.apache.isis.runtime.system.DeploymentType;
import org.apache.isis.runtime.system.IsisSystem;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.app.cssrenderer.ApplicationCssRenderer;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCache;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCacheAccessor;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
+import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
+import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServer;
+import org.apache.isis.viewer.wicket.viewer.integration.nof.WicketServerPrototype;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapter;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
import org.apache.wicket.Application;
import org.apache.wicket.IConverterLocator;
import org.apache.wicket.Page;
@@ -108,7 +108,7 @@ import css.Css;
* <li> {@link #newRequestCycle(Request, Response)} (probably should not be changed.)</li>
* </ul>
*/
-public class WicketObjectsApplication extends AuthenticatedWebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ImageCacheAccessor, ApplicationCssRenderer, AuthenticationSessionAccessor {
+public class IsisWicketApplication extends AuthenticatedWebApplication implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor, ImageCacheAccessor, ApplicationCssRenderer, AuthenticationSessionAccessor {
private static final long serialVersionUID = 1L;
@@ -117,8 +117,8 @@ public class WicketObjectsApplication ex
/**
* Convenience locator, downcasts inherited functionality.
*/
- public static WicketObjectsApplication get() {
- return (WicketObjectsApplication) AuthenticatedWebApplication.get();
+ public static IsisWicketApplication get() {
+ return (IsisWicketApplication) AuthenticatedWebApplication.get();
}
/**
@@ -158,7 +158,7 @@ public class WicketObjectsApplication ex
// constructor, init
///////////////////////////////////////////////////
- public WicketObjectsApplication() {
+ public IsisWicketApplication() {
}
/**
@@ -174,7 +174,7 @@ public class WicketObjectsApplication ex
DeploymentType deploymentType = determineDeploymentType();
final IsisModule isisModule = new IsisModule(deploymentType);
- final Injector injector = Guice.createInjector(isisModule, newWicketObjectsModule());
+ final Injector injector = Guice.createInjector(isisModule, newIsisWicketModule());
injector.injectMembers(this);
initWicketComponentInjection(injector);
@@ -197,8 +197,8 @@ public class WicketObjectsApplication ex
/**
* Override if required
*/
- protected Module newWicketObjectsModule() {
- return new WicketObjectsModule();
+ protected Module newIsisWicketModule() {
+ return new IsisWicketModule();
}
Copied: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsModule.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsModule.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsModule.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketModule.java Wed Oct 27 17:00:06 2010
@@ -18,22 +18,22 @@
*/
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCache;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryList;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassList;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.viewer.imagecache.ImageCacheClassPath;
-import org.apache.isis.extensions.wicket.viewer.registries.components.ComponentFactoryListDefault;
-import org.apache.isis.extensions.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
-import org.apache.isis.extensions.wicket.viewer.registries.pages.PageClassListDefault;
-import org.apache.isis.extensions.wicket.viewer.registries.pages.PageClassRegistryDefault;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCache;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.viewer.imagecache.ImageCacheClassPath;
+import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryListDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.components.ComponentFactoryRegistryDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
import com.google.inject.AbstractModule;
-public class WicketObjectsModule extends AbstractModule {
+public class IsisWicketModule extends AbstractModule {
@@ -44,8 +44,8 @@ public class WicketObjectsModule extends
bind(PageClassList.class).to(PageClassListDefault.class);
bind(ComponentFactoryList.class).to(ComponentFactoryListDefault.class);
bind(ImageCache.class).to(ImageCacheClassPath.class);
- bindConstant().annotatedWith(ApplicationCssUrl.class).to("configurationTypeAccessor.css");
+ bindConstant().annotatedWith(ApplicationCssUrl.class).to("application.css");
}
-
+
}
\ No newline at end of file
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageCacheClassPath.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.viewer.imagecache;
+package org.apache.isis.viewer.wicket.viewer.imagecache;
import images.Images;
@@ -26,8 +26,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import org.apache.isis.extensions.wicket.ui.app.imagecache.ImageCache;
import org.apache.isis.metamodel.spec.ObjectSpecification;
+import org.apache.isis.viewer.wicket.ui.app.imagecache.ImageCache;
import org.apache.wicket.markup.html.PackageResource;
import com.google.common.collect.Maps;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/DeploymentTypeAbstract.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.nof;
import org.apache.isis.runtime.system.ContextCategory;
import org.apache.isis.runtime.system.DeploymentCategory;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/IsisContextForWicket.java Wed Oct 27 17:00:06 2010
@@ -18,20 +18,20 @@
*/
-package org.apache.isis.extensions.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.nof;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.apache.isis.commons.exceptions.NotYetImplementedException;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
import org.apache.isis.metamodel.authentication.AuthenticationSession;
import org.apache.isis.runtime.context.IsisContext;
import org.apache.isis.runtime.session.IsisSession;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.runtime.system.ContextCategory;
import org.apache.isis.runtime.system.internal.InitialisationSession;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
import org.apache.wicket.Session;
import com.google.common.base.Function;
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServer.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.extensions.wicket.viewer.integration.nof;
+package org.apache.isis.viewer.wicket.viewer.integration.nof;
import org.apache.isis.runtime.system.DeploymentCategory;
import org.apache.isis.runtime.system.DeploymentType;