isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1028037 [13/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...
Date Wed, 27 Oct 2010 17:00:32 GMT
Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.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/WicketServerExploration.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerExploration.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;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.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/WicketServerPrototype.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/nof/WicketServerPrototype.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;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.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/wicket/AuthenticatedWebSessionForIsis.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/AuthenticatedWebSessionForIsis.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.integration.wicket;
+package org.apache.isis.viewer.wicket.viewer.integration.wicket;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -28,12 +28,12 @@ import java.util.Arrays;
 import java.util.List;
 
 import org.apache.isis.commons.ensure.Ensure;
-import org.apache.isis.extensions.wicket.model.nof.AuthenticationSessionAccessor;
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
 import org.apache.isis.runtime.authentication.AuthenticationRequestPassword;
 import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.viewer.wicket.model.nof.AuthenticationSessionAccessor;
 import org.apache.wicket.Request;
 import org.apache.wicket.Session;
 import org.apache.wicket.authentication.AuthenticatedWebSession;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.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/wicket/ConverterForObjectAdapter.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapter.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.integration.wicket;
+package org.apache.isis.viewer.wicket.viewer.integration.wicket;
 
 import java.util.Locale;
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.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/wicket/ConverterForObjectAdapterMemento.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/ConverterForObjectAdapterMemento.java Wed Oct 27 17:00:06 2010
@@ -18,18 +18,18 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.integration.wicket;
+package org.apache.isis.viewer.wicket.viewer.integration.wicket;
 
 import java.util.Locale;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
 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.runtime.persistence.adaptermanager.AdapterManager;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
 import org.apache.wicket.util.convert.IConverter;
 
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.integration.wicket;
+package org.apache.isis.viewer.wicket.viewer.integration.wicket;
 
 import org.apache.isis.metamodel.authentication.AuthenticationSession;
 import org.apache.isis.runtime.context.IsisContext;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/UserPanel.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.login;
+package org.apache.isis.viewer.wicket.viewer.login;
 
 /**
  * TODO

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignInPage.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.login;
+package org.apache.isis.viewer.wicket.viewer.login;
 
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.authentication.pages.SignInPage;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/login/WicketSignOutPage.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.login;
+package org.apache.isis.viewer.wicket.viewer.login;
 
 import org.apache.wicket.authentication.pages.SignOutPage;
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryListDefault.java Wed Oct 27 17:00:06 2010
@@ -18,60 +18,60 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.registries.components;
+package org.apache.isis.viewer.wicket.viewer.registries.components;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.ServiceLoader;
 
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.actions.params.ActionParametersFormPanelFactory;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryList;
-import org.apache.isis.extensions.wicket.ui.components.actions.ActionInfoPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.actions.ActionPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.appactions.cssmenu.AppActionsCssMenuFactory;
-import org.apache.isis.extensions.wicket.ui.components.collection.CollectionPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTableFactory;
-import org.apache.isis.extensions.wicket.ui.components.collectioncontents.icons.CollectionContentsAsIconsFactory;
-import org.apache.isis.extensions.wicket.ui.components.collectioncontents.selector.CollectionContentsSelectorFactory;
-import org.apache.isis.extensions.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
-import org.apache.isis.extensions.wicket.ui.components.empty.EmptyCollectionPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesAndCollectionsPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.blocks.summary.EntitySummaryPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.selector.EntitySelectorFactory;
-import org.apache.isis.extensions.wicket.ui.components.entity.tabbed.EntityTabbedPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.jdkdates.JavaSqlDatePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.jdkdates.JavaSqlTimePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.jdkdates.JavaUtilDatePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.jdkmath.JavaMathBigDecimalPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.jdkmath.JavaMathBigIntegerPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoColorPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoDatePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoDateTimePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoMoneyPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoPasswordPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoPercentagePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoTimePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.noapplib.NoTimeStampPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.BooleanPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.BytePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.CharacterPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.DoublePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.FloatPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.IntegerPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.LongPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.primitive.ShortPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.reference.ReferencePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.string.StringPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.value.ValuePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.scalars.wizardpagedesc.WizardPageDescriptionPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.value.StandaloneValuePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.welcome.WelcomePanelFactory;
-import org.apache.isis.extensions.wicket.ui.components.widgets.entitylink.EntityLinkFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.actions.params.ActionParametersFormPanelFactory;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
+import org.apache.isis.viewer.wicket.ui.components.actions.ActionInfoPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.actions.ActionPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.appactions.cssmenu.AppActionsCssMenuFactory;
+import org.apache.isis.viewer.wicket.ui.components.collection.CollectionPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTableFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.icons.CollectionContentsAsIconsFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.CollectionContentsSelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
+import org.apache.isis.viewer.wicket.ui.components.empty.EmptyCollectionPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesAndCollectionsPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.blocks.summary.EntitySummaryPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.EntitySelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.tabbed.EntityTabbedPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaSqlDatePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaSqlTimePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates.JavaUtilDatePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.JavaMathBigDecimalPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath.JavaMathBigIntegerPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoColorPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoDatePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoDateTimePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoMoneyPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoPasswordPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoPercentagePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoTimePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.noapplib.NoTimeStampPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BooleanPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BytePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.CharacterPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.DoublePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.FloatPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.IntegerPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.LongPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.ShortPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.reference.ReferencePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.string.StringPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.value.ValuePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.scalars.wizardpagedesc.WizardPageDescriptionPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.value.StandaloneValuePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.widgets.entitylink.EntityLinkFactory;
 
 /**
  * Default implementation of {@link ComponentFactoryList} that registers

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.registries.components;
+package org.apache.isis.viewer.wicket.viewer.registries.components;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,11 +26,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.isis.extensions.wicket.ui.ComponentFactory;
-import org.apache.isis.extensions.wicket.ui.ComponentFactory.ApplicationAdvice;
-import org.apache.isis.extensions.wicket.ui.ComponentType;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryList;
-import org.apache.isis.extensions.wicket.ui.app.registry.ComponentFactoryRegistry;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.ComponentFactory.ApplicationAdvice;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryList;
+import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.model.IModel;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.registries.pages;
+package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
-import org.apache.isis.extensions.wicket.ui.pages.PageClassList;
-import org.apache.isis.extensions.wicket.ui.pages.PageRegistrySpi;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
-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.extensions.wicket.viewer.login.WicketSignInPage;
-import org.apache.isis.extensions.wicket.viewer.login.WicketSignOutPage;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassList;
+import org.apache.isis.viewer.wicket.ui.pages.PageRegistrySpi;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
+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.isis.viewer.wicket.viewer.login.WicketSignInPage;
+import org.apache.isis.viewer.wicket.viewer.login.WicketSignOutPage;
 
 import com.google.inject.Singleton;
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.registries.pages;
+package org.apache.isis.viewer.wicket.viewer.registries.pages;
 
 import java.util.Map;
 
 import org.apache.isis.commons.ensure.Ensure;
-import org.apache.isis.extensions.wicket.model.util.Classes;
-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.PageRegistrySpi;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
+import org.apache.isis.viewer.wicket.model.util.Classes;
+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.PageRegistrySpi;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
 import org.apache.wicket.Page;
 import org.hamcrest.Matcher;
 

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_AuthenticationManager_AuthenticateOk.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 org.apache.isis.common.jmock.MockFixture;
 import org.apache.isis.common.jmock.MockFixtureAdapter;

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_Request_Stub.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_Request_Stub.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_Request_Stub.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/Fixture_Request_Stub.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/Fixture_Request_Stub.java Wed Oct 27 17:00:06 2010
@@ -21,7 +21,7 @@
 /**
  * 
  */
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
 
 import java.util.Locale;
 

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Defaults.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Defaults.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 static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -26,10 +26,11 @@ import static org.hamcrest.Matchers.null
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.model.mementos.ObjectAdapterMemento;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 import org.apache.isis.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.wicket.model.mementos.ObjectAdapterMemento;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 import org.apache.wicket.IConverterLocator;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.Response;
@@ -43,7 +44,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
-public class WicketObjectsApplication_Defaults {
+public class IsisWicketApplication_Defaults {
 
 	private FixtureMockery context = new FixtureMockery() {
 		{
@@ -51,11 +52,11 @@ public class WicketObjectsApplication_De
 		}
 	};
 	
-	private WicketObjectsApplication application;
+	private IsisWicketApplication application;
 
 	@Before
 	public void setUp() throws Exception {
-		application = new WicketObjectsApplication();
+		application = new IsisWicketApplication();
 	}
 
 	@After

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_Pages.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_Pages.java Wed Oct 27 17:00:06 2010
@@ -18,15 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.ui.pages.PageClassRegistry;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
-import org.apache.isis.extensions.wicket.ui.pages.home.HomePage;
+import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.WebPage;
 import org.jmock.Expectations;
@@ -36,30 +37,30 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(JMock.class)
-public class WicketObjectsApplication_Pages {
+public class IsisWicketApplication_Pages {
 
 	private FixtureMockery context = new FixtureMockery() {
 		{
 			setImposteriser(ClassImposteriser.INSTANCE);
 		}
 	};
-	
-	private WicketObjectsApplication application;
+
+	private IsisWicketApplication application;
 
 	@Test
 	public void delegatesToPageClassRegistryToObtainPageTypes() {
 		final PageType pageType = PageType.HOME;
 		final Class<HomePage> expectedPageClass = HomePage.class;
-		
+
 		final PageClassRegistry mockPageClassRegistry = context.mock(PageClassRegistry.class);
-		application = new WicketObjectsApplication() {
+		application = new IsisWicketApplication() {
             private static final long serialVersionUID = 1L;
 
             @Override
 			public PageClassRegistry getPageClassRegistry() {
 				return mockPageClassRegistry;
 			}
-			
+
 		};
 		context.checking(new Expectations() {
 			{
@@ -73,12 +74,12 @@ public class WicketObjectsApplication_Pa
 
 	@Test
 	public void delegatesToPageClassRegistryToObtainPageTypes_ForSignIn() {
-		
+
 		final PageType pageType = PageType.SIGN_IN;
 		final Class<WebPage> expectedPageClass = WebPage.class;
-		
+
 		final PageClassRegistry mockPageClassRegistry = context.mock(PageClassRegistry.class);
-		application = new WicketObjectsApplication() {
+		application = new IsisWicketApplication() {
             private static final long serialVersionUID = 1L;
 
             @Override

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_init.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_init.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_init.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectsApplication_init.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication_init.java Wed Oct 27 17:00:06 2010
@@ -18,13 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.AbstractJMockForInterfacesTest;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketApplication;
 import org.apache.wicket.settings.IResourceSettings;
 import org.apache.wicket.settings.ISecuritySettings;
 import org.junit.Before;
@@ -32,9 +33,9 @@ import org.junit.Test;
 
 import com.google.inject.Injector;
 
-public class WicketObjectsApplication_init extends AbstractJMockForInterfacesTest {
+public class IsisWicketApplication_init extends AbstractJMockForInterfacesTest {
 
-	private WicketObjectsApplication application;
+	private IsisWicketApplication application;
 
     private ISecuritySettings mockSecuritySettings;
     private IResourceSettings mockResourceSettings;
@@ -46,7 +47,7 @@ public class WicketObjectsApplication_in
 	    ignoring(mockSecuritySettings);
         ignoring(mockResourceSettings);
 	    
-		application = new WicketObjectsApplication() {
+		application = new IsisWicketApplication() {
             private static final long serialVersionUID = 1L;
             @Override
             protected void initWicketComponentInjection(final Injector injector) {

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_providers.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/IsisWicket_providers.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 static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertTha
 import org.apache.isis.metamodel.config.ConfigurationBuilder;
 import org.apache.isis.runtime.system.DeploymentType;
 import org.apache.isis.runtime.system.IsisSystem;
+import org.apache.isis.viewer.wicket.viewer.IsisWicketModule;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -34,14 +35,14 @@ import org.junit.Test;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-public class WicketObjectModule_providers {
+public class IsisWicket_providers {
 
-    private WicketObjectsModule wicketObjectsModule;
+    private IsisWicketModule wicketObjectsModule;
     private Injector injector;
-    
+
     @Before
     public void setUp() throws Exception {
-        wicketObjectsModule = new WicketObjectsModule();
+        wicketObjectsModule = new IsisWicketModule();
         injector = Guice.createInjector(wicketObjectsModule);
     }
 

Copied: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/WicketObjectModule_bindingsStandard.java (from r1026611, incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/WicketObjectModule_bindingsStandard.java?p2=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/WicketObjectModule_bindingsStandard.java&p1=incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java&r1=1026611&r2=1028037&rev=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/extensions/wicket/viewer/WicketObjectModule_bindingsStandard.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/WicketObjectModule_bindingsStandard.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 static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
@@ -27,14 +27,15 @@ import static org.junit.Assert.assertTha
 import java.util.Arrays;
 import java.util.Collection;
 
-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.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.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.IsisWicketModule;
+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 org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -47,7 +48,7 @@ import com.google.inject.Injector;
 @RunWith(Parameterized.class)
 public class WicketObjectModule_bindingsStandard {
 
-    private WicketObjectsModule wicketObjectsModule;
+    private IsisWicketModule wicketObjectsModule;
     private Injector injector;
     private Class<?> from;
     private Class<?> to;
@@ -69,7 +70,7 @@ public class WicketObjectModule_bindings
 
     @Before
     public void setUp() throws Exception {
-        wicketObjectsModule = new WicketObjectsModule();
+        wicketObjectsModule = new IsisWicketModule();
         injector = Guice.createInjector(wicketObjectsModule);
     }
 

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Authenticate.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -26,11 +26,11 @@ import static org.hamcrest.Matchers.null
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
-import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
 import org.apache.isis.runtime.authentication.AuthenticationRequest;
+import org.apache.isis.viewer.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
+import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_DownCastsInheritedFunctionality.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import org.junit.Before;
 import org.junit.Ignore;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_Instantiation.java Wed Oct 27 17:00:06 2010
@@ -18,11 +18,11 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
+import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.lib.legacy.ClassImposteriser;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_NotYetImplemented.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import org.junit.Before;
 import org.junit.Ignore;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_SignIn.java Wed Oct 27 17:00:06 2010
@@ -18,16 +18,16 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
-import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.viewer.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
+import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.lib.legacy.ClassImposteriser;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/AuthenticatedWebSessionForIsis_ThreadManagement.java Wed Oct 27 17:00:06 2010
@@ -18,14 +18,14 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.isis.common.jmock.FixtureMockery;
-import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
+import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.lib.legacy.ClassImposteriser;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/Fixture_AuthenticatedWebSessionForIsis_SignedIn.java Wed Oct 27 17:00:06 2010
@@ -18,7 +18,7 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
@@ -26,10 +26,10 @@ import static org.junit.Assert.assertTha
 import org.apache.isis.common.jmock.FixtureMockery;
 import org.apache.isis.common.jmock.MockFixture;
 import org.apache.isis.common.jmock.MockFixtureAdapter;
-import org.apache.isis.extensions.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
-import org.apache.isis.extensions.wicket.viewer.Fixture_Request_Stub;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.isis.runtime.authentication.AuthenticationManager;
+import org.apache.isis.viewer.wicket.viewer.Fixture_AuthenticationManager_AuthenticateOk;
+import org.apache.isis.viewer.wicket.viewer.Fixture_Request_Stub;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.AuthenticatedWebSessionForIsis;
 import org.apache.wicket.Request;
 
 /**

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/app/wicket/WebRequestCycleForIsisTest.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.app.wicket;
+package org.apache.isis.viewer.wicket.viewer.app.wicket;
 
 import static org.junit.Assert.fail;
 
 import org.apache.isis.common.jmock.AbstractJMockForClassesTest;
-import org.apache.isis.extensions.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
+import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis;
 import org.apache.wicket.Response;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.protocol.http.WebRequest;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_Instantiation.java Wed Oct 27 17:00:06 2010
@@ -18,12 +18,12 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.pages;
+package org.apache.isis.viewer.wicket.viewer.pages;
 
-import org.apache.isis.extensions.wicket.ui.pages.PageClassList;
-import org.apache.isis.extensions.wicket.ui.pages.PageRegistrySpi;
-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.pages.PageClassList;
+import org.apache.isis.viewer.wicket.ui.pages.PageRegistrySpi;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Modified: incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java?rev=1028037&r1=1026611&r2=1028037&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java (original)
+++ incubator/isis/trunk/viewer/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/pages/PageClassListDefault_RegistrationAndCaching.java Wed Oct 27 17:00:06 2010
@@ -18,18 +18,18 @@
  */
 
 
-package org.apache.isis.extensions.wicket.viewer.pages;
+package org.apache.isis.viewer.wicket.viewer.pages;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
-import org.apache.isis.extensions.wicket.model.models.ActionModel;
-import org.apache.isis.extensions.wicket.ui.pages.PageType;
-import org.apache.isis.extensions.wicket.ui.pages.action.ActionPage;
-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.model.models.ActionModel;
+import org.apache.isis.viewer.wicket.ui.pages.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.action.ActionPage;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassListDefault;
+import org.apache.isis.viewer.wicket.viewer.registries.pages.PageClassRegistryDefault;
 import org.apache.wicket.Page;
 import org.junit.Before;
 import org.junit.Test;



Mime
View raw message