ISIS-1049: moving viewer-wicket into core.

apache · Feb 19, 2015 · d84c660 · d84c660
1 parent cb26cbe
commit d84c660
Show file tree

Hide file tree

Showing 543 changed files with 407 additions and 441 deletions.
diff --git a/component/viewer/wicket/pom.xml b/component/viewer/wicket/pom.xml
diff --git a/core/pom.xml b/core/pom.xml
@@ -122,6 +122,17 @@
 
         <jetty.version>6.1.26</jetty.version>
 
+        <wicket.version>6.17.0</wicket.version>
+        <wicketstuff.version>6.17.0</wicketstuff.version>
+
+        <wicket-webjars.version>0.4.3</wicket-webjars.version>
+        <wicket-bootstrap.version>0.9.7</wicket-bootstrap.version>
+        <wicket-source.version>6.0.0.8</wicket-source.version>
+
+        <wicket-select2.version>2.2.3</wicket-select2.version>
+        <select2.version>3.5.1</select2.version>
+        <jquery-ui.version>1.10.4</jquery-ui.version>
+
         <guice.version>3.0</guice.version>
         <picocontainer.version>2.14.3</picocontainer.version>
 
@@ -1175,6 +1186,51 @@ ${license.additional-notes}
                 <version>1.8.0-SNAPSHOT</version>
             </dependency>
 
+
+            <!-- also for benefit of application developers, using scope=import -->
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-applib</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-model</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-model</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-ui</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-ui</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-impl</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>isis-viewer-wicket-impl</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <scope>test</scope>
+                <type>test-jar</type>
+            </dependency>
+
+
             <!-- Maven plugin -->
             <dependency>
                 <groupId>org.apache.isis.tool</groupId>
@@ -1384,6 +1440,270 @@ ${license.additional-notes}
                 </exclusions>
             </dependency>
 
+
+
+            <!-- Wicket -->
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket</artifactId>
+                <version>${wicket.version}</version>
+                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-core</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-request</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-util</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-extensions</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-datetime</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-auth-roles</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.wicket</groupId>
+                <artifactId>wicket-guice</artifactId>
+                <version>${wicket.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <!-- for Java7 compatibility (we don't use the proxying capability of this component) -->
+                        <groupId>cglib</groupId>
+                        <artifactId>cglib</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- Wicket-Select2 -->
+            <dependency>
+                <groupId>com.vaynberg.wicket.select2</groupId>
+                <artifactId>wicket-select2</artifactId>
+                <version>${wicket-select2.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>select2</artifactId>
+                <version>${select2.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery-ui</artifactId>
+                <version>${jquery-ui.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>jquery</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <!-- Webjars -->
+            <dependency>
+                <groupId>de.agilecoders.wicket.webjars</groupId>
+                <artifactId>wicket-webjars</artifactId>
+                <version>${wicket-webjars.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-request</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>de.agilecoders.wicket</groupId>
+                <artifactId>wicket-bootstrap-core</artifactId>
+                <version>${wicket-bootstrap.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-util</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-request</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-extensions</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>de.agilecoders.wicket</groupId>
+                <artifactId>wicket-bootstrap-extensions</artifactId>
+                <version>${wicket-bootstrap.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-util</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-request</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-extensions</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>bootstrap</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>jquery</artifactId>
+                    </exclusion>
+                    <!-- exclude unused extensions -->
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>jquerypp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>jquery-ui</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>typeaheadjs</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>x-editable-bootstrap</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.webjars</groupId>
+                        <artifactId>spin-js</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>com.google.javascript</groupId>
+                        <artifactId>closure-compiler</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>de.agilecoders.wicket</groupId>
+                <artifactId>wicket-bootstrap-themes</artifactId>
+                <version>${wicket-bootstrap.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+
+            <dependency>
+                <groupId>net.ftlines.wicket-source</groupId>
+                <artifactId>wicket-source</artifactId>
+                <version>${wicket-source.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <!-- for dependency convergence -->
+                        <groupId>org.apache.wicket</groupId>
+                        <artifactId>wicket-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+
             <!-- predicate libraries -->
             <dependency>
                 <groupId>org.hamcrest</groupId>
@@ -1880,6 +2200,8 @@ ${license.additional-notes}
         <module>viewer-restfulobjects-rendering</module>
         <module>viewer-restfulobjects-server</module>
 
+        <module>viewer-wicket</module>
+
         <module>maven-plugin</module>
     </modules>
 

diff --git a/component/viewer/wicket/NOTICE → core/viewer-wicket/NOTICE b/component/viewer/wicket/NOTICE → core/viewer-wicket/NOTICE
diff --git a/component/viewer/wicket/applib/pom.xml → core/viewer-wicket/applib/pom.xml b/component/viewer/wicket/applib/pom.xml → core/viewer-wicket/applib/pom.xml
diff --git a/...plib/WicketDeveloperUtilitiesService.java → ...plib/WicketDeveloperUtilitiesService.java b/...plib/WicketDeveloperUtilitiesService.java → ...plib/WicketDeveloperUtilitiesService.java
diff --git a/component/viewer/wicket/impl/pom.xml → core/viewer-wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml → core/viewer-wicket/impl/pom.xml
diff --git a/.../wicket/viewer/IsisWicketApplication.java → .../wicket/viewer/IsisWicketApplication.java b/.../wicket/viewer/IsisWicketApplication.java → .../wicket/viewer/IsisWicketApplication.java
diff --git a/...iewer/wicket/viewer/IsisWicketModule.java → ...iewer/wicket/viewer/IsisWicketModule.java b/...iewer/wicket/viewer/IsisWicketModule.java → ...iewer/wicket/viewer/IsisWicketModule.java
diff --git a/...agecache/ImageResourceCacheClassPath.java → ...agecache/ImageResourceCacheClassPath.java b/...agecache/ImageResourceCacheClassPath.java → ...agecache/ImageResourceCacheClassPath.java
diff --git a/...wer/imagecache/ImageResourceCacheKey.java → ...wer/imagecache/ImageResourceCacheKey.java b/...wer/imagecache/ImageResourceCacheKey.java → ...wer/imagecache/ImageResourceCacheKey.java
diff --git a/...egration/isis/DeploymentTypeAbstract.java → ...egration/isis/DeploymentTypeAbstract.java b/...egration/isis/DeploymentTypeAbstract.java → ...egration/isis/DeploymentTypeAbstract.java
diff --git a/...on/isis/DeploymentTypeWicketAbstract.java → ...on/isis/DeploymentTypeWicketAbstract.java b/...on/isis/DeploymentTypeWicketAbstract.java → ...on/isis/DeploymentTypeWicketAbstract.java
diff --git a/...viewer/integration/isis/WicketServer.java → ...viewer/integration/isis/WicketServer.java b/...viewer/integration/isis/WicketServer.java → ...viewer/integration/isis/WicketServer.java
diff --git a/...tegration/isis/WicketServerPrototype.java → ...tegration/isis/WicketServerPrototype.java b/...tegration/isis/WicketServerPrototype.java → ...tegration/isis/WicketServerPrototype.java
diff --git a/...on/wicket/AnonymousWebSessionForIsis.java → ...on/wicket/AnonymousWebSessionForIsis.java b/...on/wicket/AnonymousWebSessionForIsis.java → ...on/wicket/AnonymousWebSessionForIsis.java
diff --git a/...icket/AuthenticatedWebSessionForIsis.java → ...icket/AuthenticatedWebSessionForIsis.java b/...icket/AuthenticatedWebSessionForIsis.java → ...icket/AuthenticatedWebSessionForIsis.java
diff --git a/...ion/wicket/ConverterForObjectAdapter.java → ...ion/wicket/ConverterForObjectAdapter.java b/...ion/wicket/ConverterForObjectAdapter.java → ...ion/wicket/ConverterForObjectAdapter.java
diff --git a/...ket/ConverterForObjectAdapterMemento.java → ...ket/ConverterForObjectAdapterMemento.java b/...ket/ConverterForObjectAdapterMemento.java → ...ket/ConverterForObjectAdapterMemento.java
diff --git a/...ration/wicket/WebRequestCycleForIsis.java → ...ration/wicket/WebRequestCycleForIsis.java b/...ration/wicket/WebRequestCycleForIsis.java → ...ration/wicket/WebRequestCycleForIsis.java
diff --git a/...nts/ComponentFactoryRegistrarDefault.java → ...nts/ComponentFactoryRegistrarDefault.java b/...nts/ComponentFactoryRegistrarDefault.java → ...nts/ComponentFactoryRegistrarDefault.java
diff --git a/...ents/ComponentFactoryRegistryDefault.java → ...ents/ComponentFactoryRegistryDefault.java b/...ents/ComponentFactoryRegistryDefault.java → ...ents/ComponentFactoryRegistryDefault.java
diff --git a/...egistries/pages/PageClassListDefault.java → ...egistries/pages/PageClassListDefault.java b/...egistries/pages/PageClassListDefault.java → ...egistries/pages/PageClassListDefault.java
diff --git a/...tries/pages/PageClassRegistryDefault.java → ...tries/pages/PageClassRegistryDefault.java b/...tries/pages/PageClassRegistryDefault.java → ...tries/pages/PageClassRegistryDefault.java
diff --git a/...s/pages/PageNavigationServiceDefault.java → ...s/pages/PageNavigationServiceDefault.java b/...s/pages/PageNavigationServiceDefault.java → ...s/pages/PageNavigationServiceDefault.java
diff --git a/...iewer/services/DeepLinkServiceWicket.java → ...iewer/services/DeepLinkServiceWicket.java b/...iewer/services/DeepLinkServiceWicket.java → ...iewer/services/DeepLinkServiceWicket.java
diff --git a/...viewer/services/LocaleProviderWicket.java → ...viewer/services/LocaleProviderWicket.java b/...viewer/services/LocaleProviderWicket.java → ...viewer/services/LocaleProviderWicket.java
diff --git a/.../services/TranslationsResolverWicket.java → .../services/TranslationsResolverWicket.java b/.../services/TranslationsResolverWicket.java → .../services/TranslationsResolverWicket.java
diff --git a/...viewer/settings/IsisResourceSettings.java → ...viewer/settings/IsisResourceSettings.java b/...viewer/settings/IsisResourceSettings.java → ...viewer/settings/IsisResourceSettings.java
diff --git a/...settings/WicketViewerSettingsDefault.java → ...settings/WicketViewerSettingsDefault.java b/...settings/WicketViewerSettingsDefault.java → ...settings/WicketViewerSettingsDefault.java
diff --git a/.../impl/src/main/resources/log4j.properties → .../impl/src/main/resources/log4j.properties b/.../impl/src/main/resources/log4j.properties → .../impl/src/main/resources/log4j.properties
diff --git a/...iewer/IsisWicketApplication_Defaults.java → ...iewer/IsisWicketApplication_Defaults.java b/...iewer/IsisWicketApplication_Defaults.java → ...iewer/IsisWicketApplication_Defaults.java
diff --git a/...t/viewer/IsisWicketApplication_Pages.java → ...t/viewer/IsisWicketApplication_Pages.java b/...t/viewer/IsisWicketApplication_Pages.java → ...t/viewer/IsisWicketApplication_Pages.java
diff --git a/...r/wicket/viewer/IsisWicket_providers.java → ...r/wicket/viewer/IsisWicket_providers.java b/...r/wicket/viewer/IsisWicket_providers.java → ...r/wicket/viewer/IsisWicket_providers.java
diff --git a/.../WicketObjectModule_bindingsStandard.java → .../WicketObjectModule_bindingsStandard.java b/.../WicketObjectModule_bindingsStandard.java → .../WicketObjectModule_bindingsStandard.java
diff --git a/...icatedWebSessionForIsis_Authenticate.java → ...icatedWebSessionForIsis_Authenticate.java b/...icatedWebSessionForIsis_Authenticate.java → ...icatedWebSessionForIsis_Authenticate.java
diff --git a/...Isis_DownCastsInheritedFunctionality.java → ...Isis_DownCastsInheritedFunctionality.java b/...Isis_DownCastsInheritedFunctionality.java → ...Isis_DownCastsInheritedFunctionality.java
diff --git a/...catedWebSessionForIsis_Instantiation.java → ...catedWebSessionForIsis_Instantiation.java b/...catedWebSessionForIsis_Instantiation.java → ...catedWebSessionForIsis_Instantiation.java
diff --git a/...dWebSessionForIsis_NotYetImplemented.java → ...dWebSessionForIsis_NotYetImplemented.java b/...dWebSessionForIsis_NotYetImplemented.java → ...dWebSessionForIsis_NotYetImplemented.java
diff --git a/...uthenticatedWebSessionForIsis_SignIn.java → ...uthenticatedWebSessionForIsis_SignIn.java b/...uthenticatedWebSessionForIsis_SignIn.java → ...uthenticatedWebSessionForIsis_SignIn.java
diff --git a/...imagecache/ImageResourceCacheKeyTest.java → ...imagecache/ImageResourceCacheKeyTest.java b/...imagecache/ImageResourceCacheKeyTest.java → ...imagecache/ImageResourceCacheKeyTest.java
diff --git a/...s/PageClassListDefault_Instantiation.java → ...s/PageClassListDefault_Instantiation.java b/...s/PageClassListDefault_Instantiation.java → ...s/PageClassListDefault_Instantiation.java
diff --git a/...ssListDefault_RegistrationAndCaching.java → ...ssListDefault_RegistrationAndCaching.java b/...ssListDefault_RegistrationAndCaching.java → ...ssListDefault_RegistrationAndCaching.java
diff --git a/...vices/TranslationsResolverWicketTest.java → ...vices/TranslationsResolverWicketTest.java b/...vices/TranslationsResolverWicketTest.java → ...vices/TranslationsResolverWicketTest.java
diff --git a/component/viewer/wicket/model/pom.xml → core/viewer-wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml → core/viewer-wicket/model/pom.xml
diff --git a/...common/OnConcurrencyExceptionHandler.java → ...common/OnConcurrencyExceptionHandler.java b/...common/OnConcurrencyExceptionHandler.java → ...common/OnConcurrencyExceptionHandler.java
diff --git a/...cket/model/common/OnSelectionHandler.java → ...cket/model/common/OnSelectionHandler.java b/...cket/model/common/OnSelectionHandler.java → ...cket/model/common/OnSelectionHandler.java
diff --git a/...ket/model/common/PageParametersUtils.java → ...ket/model/common/PageParametersUtils.java b/...ket/model/common/PageParametersUtils.java → ...ket/model/common/PageParametersUtils.java
diff --git a/...model/hints/IsisActionCompletedEvent.java → ...model/hints/IsisActionCompletedEvent.java b/...model/hints/IsisActionCompletedEvent.java → ...model/hints/IsisActionCompletedEvent.java
diff --git a/...wicket/model/hints/IsisEnvelopeEvent.java → ...wicket/model/hints/IsisEnvelopeEvent.java b/...wicket/model/hints/IsisEnvelopeEvent.java → ...wicket/model/hints/IsisEnvelopeEvent.java
diff --git a/...wicket/model/hints/IsisEventAbstract.java → ...wicket/model/hints/IsisEventAbstract.java b/...wicket/model/hints/IsisEventAbstract.java → ...wicket/model/hints/IsisEventAbstract.java
diff --git a/.../model/hints/IsisEventLetterAbstract.java → .../model/hints/IsisEventLetterAbstract.java b/.../model/hints/IsisEventLetterAbstract.java → .../model/hints/IsisEventLetterAbstract.java
diff --git a/...r/wicket/model/hints/IsisUiHintEvent.java → ...r/wicket/model/hints/IsisUiHintEvent.java b/...r/wicket/model/hints/IsisUiHintEvent.java → ...r/wicket/model/hints/IsisUiHintEvent.java
diff --git a/...r/wicket/model/hints/UiHintContainer.java → ...r/wicket/model/hints/UiHintContainer.java b/...r/wicket/model/hints/UiHintContainer.java → ...r/wicket/model/hints/UiHintContainer.java
diff --git a/...et/model/hints/UiHintPathSignificant.java → ...et/model/hints/UiHintPathSignificant.java b/...et/model/hints/UiHintPathSignificant.java → ...et/model/hints/UiHintPathSignificant.java
diff --git a/...odel/isis/PersistenceSessionProvider.java → ...odel/isis/PersistenceSessionProvider.java b/...odel/isis/PersistenceSessionProvider.java → ...odel/isis/PersistenceSessionProvider.java
diff --git a/...cket/model/isis/WicketViewerSettings.java → ...cket/model/isis/WicketViewerSettings.java b/...cket/model/isis/WicketViewerSettings.java → ...cket/model/isis/WicketViewerSettings.java
diff --git a/...ewer/wicket/model/links/LinkAndLabel.java → ...ewer/wicket/model/links/LinkAndLabel.java b/...ewer/wicket/model/links/LinkAndLabel.java → ...ewer/wicket/model/links/LinkAndLabel.java
diff --git a/...wer/wicket/model/links/LinksProvider.java → ...wer/wicket/model/links/LinksProvider.java b/...wer/wicket/model/links/LinksProvider.java → ...wer/wicket/model/links/LinksProvider.java
diff --git a/.../wicket/model/links/ListOfLinksModel.java → .../wicket/model/links/ListOfLinksModel.java b/.../wicket/model/links/ListOfLinksModel.java → .../wicket/model/links/ListOfLinksModel.java
diff --git a/.../wicket/model/mementos/ActionMemento.java → .../wicket/model/mementos/ActionMemento.java b/.../wicket/model/mementos/ActionMemento.java → .../wicket/model/mementos/ActionMemento.java
diff --git a/...odel/mementos/ActionParameterMemento.java → ...odel/mementos/ActionParameterMemento.java b/...odel/mementos/ActionParameterMemento.java → ...odel/mementos/ActionParameterMemento.java
diff --git a/...ket/model/mementos/CollectionMemento.java → ...ket/model/mementos/CollectionMemento.java b/...ket/model/mementos/CollectionMemento.java → ...ket/model/mementos/CollectionMemento.java
diff --git a/.../model/mementos/ObjectAdapterMemento.java → .../model/mementos/ObjectAdapterMemento.java b/.../model/mementos/ObjectAdapterMemento.java → .../model/mementos/ObjectAdapterMemento.java
diff --git a/...et/model/mementos/PageParameterNames.java → ...et/model/mementos/PageParameterNames.java b/...et/model/mementos/PageParameterNames.java → ...et/model/mementos/PageParameterNames.java
diff --git a/...icket/model/mementos/PropertyMemento.java → ...icket/model/mementos/PropertyMemento.java b/...icket/model/mementos/PropertyMemento.java → ...icket/model/mementos/PropertyMemento.java
diff --git a/...ewer/wicket/model/mementos/SpecUtils.java → ...ewer/wicket/model/mementos/SpecUtils.java b/...ewer/wicket/model/mementos/SpecUtils.java → ...ewer/wicket/model/mementos/SpecUtils.java
diff --git a/...iewer/wicket/model/models/AboutModel.java → ...iewer/wicket/model/models/AboutModel.java b/...iewer/wicket/model/models/AboutModel.java → ...iewer/wicket/model/models/AboutModel.java
diff --git a/...r/wicket/model/models/ActionExecutor.java → ...r/wicket/model/models/ActionExecutor.java b/...r/wicket/model/models/ActionExecutor.java → ...r/wicket/model/models/ActionExecutor.java
diff --git a/...ewer/wicket/model/models/ActionModel.java → ...ewer/wicket/model/models/ActionModel.java b/...ewer/wicket/model/models/ActionModel.java → ...ewer/wicket/model/models/ActionModel.java
diff --git a/...wer/wicket/model/models/ActionPrompt.java → ...wer/wicket/model/models/ActionPrompt.java b/...wer/wicket/model/models/ActionPrompt.java → ...wer/wicket/model/models/ActionPrompt.java
diff --git a/...et/model/models/ActionPromptProvider.java → ...et/model/models/ActionPromptProvider.java b/...et/model/models/ActionPromptProvider.java → ...et/model/models/ActionPromptProvider.java
diff --git a/...wicket/model/models/BookmarkTreeNode.java → ...wicket/model/models/BookmarkTreeNode.java b/...wicket/model/models/BookmarkTreeNode.java → ...wicket/model/models/BookmarkTreeNode.java
diff --git a/...el/models/BookmarkTreeNodeComparator.java → ...el/models/BookmarkTreeNodeComparator.java b/...el/models/BookmarkTreeNodeComparator.java → ...el/models/BookmarkTreeNodeComparator.java
diff --git a/...icket/model/models/BookmarkableModel.java → ...icket/model/models/BookmarkableModel.java b/...icket/model/models/BookmarkableModel.java → ...icket/model/models/BookmarkableModel.java
diff --git a/...et/model/models/BookmarkedPagesModel.java → ...et/model/models/BookmarkedPagesModel.java b/...et/model/models/BookmarkedPagesModel.java → ...et/model/models/BookmarkedPagesModel.java
diff --git a/...t/model/models/EntityCollectionModel.java → ...t/model/models/EntityCollectionModel.java b/...t/model/models/EntityCollectionModel.java → ...t/model/models/EntityCollectionModel.java
diff --git a/...ewer/wicket/model/models/EntityModel.java → ...ewer/wicket/model/models/EntityModel.java b/...ewer/wicket/model/models/EntityModel.java → ...ewer/wicket/model/models/EntityModel.java
diff --git a/...cket/model/models/ImageResourceCache.java → ...cket/model/models/ImageResourceCache.java b/...cket/model/models/ImageResourceCache.java → ...cket/model/models/ImageResourceCache.java
diff --git a/...er/wicket/model/models/ModelAbstract.java → ...er/wicket/model/models/ModelAbstract.java b/...er/wicket/model/models/ModelAbstract.java → ...er/wicket/model/models/ModelAbstract.java
diff --git a/.../viewer/wicket/model/models/PageType.java → .../viewer/wicket/model/models/PageType.java b/.../viewer/wicket/model/models/PageType.java → .../viewer/wicket/model/models/PageType.java
diff --git a/...ewer/wicket/model/models/ScalarModel.java → ...ewer/wicket/model/models/ScalarModel.java b/...ewer/wicket/model/models/ScalarModel.java → ...ewer/wicket/model/models/ScalarModel.java
diff --git a/.../model/models/ScalarModelWithPending.java → .../model/models/ScalarModelWithPending.java b/.../model/models/ScalarModelWithPending.java → .../model/models/ScalarModelWithPending.java
diff --git a/...ket/model/models/ServiceActionsModel.java → ...ket/model/models/ServiceActionsModel.java b/...ket/model/models/ServiceActionsModel.java → ...ket/model/models/ServiceActionsModel.java
diff --git a/...iewer/wicket/model/models/ValueModel.java → ...iewer/wicket/model/models/ValueModel.java b/...iewer/wicket/model/models/ValueModel.java → ...iewer/wicket/model/models/ValueModel.java
diff --git a/...viewer/wicket/model/models/VoidModel.java → ...viewer/wicket/model/models/VoidModel.java b/...viewer/wicket/model/models/VoidModel.java → ...viewer/wicket/model/models/VoidModel.java
diff --git a/...wer/wicket/model/models/WelcomeModel.java → ...wer/wicket/model/models/WelcomeModel.java b/...wer/wicket/model/models/WelcomeModel.java → ...wer/wicket/model/models/WelcomeModel.java
diff --git a/...et/model/models/WicketComponentUtils.java → ...et/model/models/WicketComponentUtils.java b/...et/model/models/WicketComponentUtils.java → ...et/model/models/WicketComponentUtils.java
diff --git a/...r/wicket/model/util/MementoFunctions.java → ...r/wicket/model/util/MementoFunctions.java b/...r/wicket/model/util/MementoFunctions.java → ...r/wicket/model/util/MementoFunctions.java
diff --git a/...et/model/util/ObjectAdapterFunctions.java → ...et/model/util/ObjectAdapterFunctions.java b/...et/model/util/ObjectAdapterFunctions.java → ...et/model/util/ObjectAdapterFunctions.java
diff --git a/...viewer/wicket/model/util/OidMatchers.java → ...viewer/wicket/model/util/OidMatchers.java b/...viewer/wicket/model/util/OidMatchers.java → ...viewer/wicket/model/util/OidMatchers.java
diff --git a/.../wicket/model/models/ActionModelTest.java → .../wicket/model/models/ActionModelTest.java b/.../wicket/model/models/ActionModelTest.java → .../wicket/model/models/ActionModelTest.java
diff --git a/...ls/LowestCommonSuperclassClosureTest.java → ...ls/LowestCommonSuperclassClosureTest.java b/...ls/LowestCommonSuperclassClosureTest.java → ...ls/LowestCommonSuperclassClosureTest.java
diff --git a/...icket/model/models/ModelAbstractTest.java → ...icket/model/models/ModelAbstractTest.java b/...icket/model/models/ModelAbstractTest.java → ...icket/model/models/ModelAbstractTest.java