ISIS-1223: fixes remaining issues with merging in of branch; also bumps simpleapp to run against 1.14.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6f10e34 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6f10e34 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6f10e34 Branch: refs/heads/master Commit: f6f10e349e984a33b4e7033e9c459c9d564e9fbf Parents: c66f629 Author: Dan Haywood <[email protected]> Authored: Fri Oct 28 09:27:30 2016 +0200 Committer: Dan Haywood <[email protected]> Committed: Fri Oct 28 09:27:30 2016 +0200 ---------------------------------------------------------------------- .../wicket/viewer/IsisWicketApplication.java | 36 ++------------------ .../ui/components/footer/FooterPanel.java | 11 +++--- .../widgets/breadcrumbs/BreadcrumbPanel.html | 5 ++- example/application/simpleapp/pom.xml | 2 +- 4 files changed, 11 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java index e3dedd5..5b45c5a 100644 --- a/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java +++ b/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java @@ -55,12 +55,11 @@ import org.apache.wicket.request.cycle.IRequestCycleListener; import org.apache.wicket.request.cycle.PageRequestHandlerTracker; import org.apache.wicket.request.cycle.RequestCycleListenerCollection; import org.apache.wicket.request.resource.CssResourceReference; -import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy; +import org.apache.wicket.settings.RequestCycleSettings; import org.apache.wicket.util.time.Duration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.wicketstuff.select2.ApplicationSettings; -import net.ftlines.wicketsource.WicketSource; import org.apache.isis.core.commons.authentication.AuthenticationSession; import org.apache.isis.core.commons.config.IsisConfiguration; @@ -103,38 +102,6 @@ import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjec import org.apache.isis.viewer.wicket.viewer.integration.wicket.ConverterForObjectAdapterMemento; import org.apache.isis.viewer.wicket.viewer.integration.wicket.WebRequestCycleForIsis; import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings; -import org.apache.wicket.Application; -import org.apache.wicket.ConverterLocator; -import org.apache.wicket.IConverterLocator; -import org.apache.wicket.Page; -import org.apache.wicket.RuntimeConfigurationType; -import org.apache.wicket.SharedResources; -import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; -import org.apache.wicket.authroles.authentication.AuthenticatedWebSession; -import org.apache.wicket.core.request.mapper.MountedMapper; -import org.apache.wicket.guice.GuiceComponentInjector; -import org.apache.wicket.markup.head.IHeaderResponse; -import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse; -import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponseDecorator; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.request.cycle.IRequestCycleListener; -import org.apache.wicket.request.cycle.PageRequestHandlerTracker; -import org.apache.wicket.request.cycle.RequestCycleListenerCollection; -import org.apache.wicket.request.resource.CssResourceReference; -import org.apache.wicket.settings.RequestCycleSettings; -import org.apache.wicket.util.time.Duration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.wicketstuff.select2.ApplicationSettings; - -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Module; import de.agilecoders.wicket.core.Bootstrap; import de.agilecoders.wicket.core.markup.html.bootstrap.behavior.BootstrapBaseBehavior; @@ -143,6 +110,7 @@ import de.agilecoders.wicket.core.settings.IBootstrapSettings; import de.agilecoders.wicket.webjars.WicketWebjars; import de.agilecoders.wicket.webjars.settings.IWebjarsSettings; import de.agilecoders.wicket.webjars.settings.WebjarsSettings; +import net.ftlines.wicketsource.WicketSource; /** * Main application, subclassing the Wicket {@link Application} and http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java index 8ab6ea5..7da7692 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/footer/FooterPanel.java @@ -18,11 +18,6 @@ */ package org.apache.isis.viewer.wicket.ui.components.footer; -import org.apache.isis.viewer.wicket.model.common.PageParametersUtils; -import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel; -import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser; -import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage; -import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.basic.Label; @@ -31,6 +26,12 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.isis.viewer.wicket.model.common.PageParametersUtils; +import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbPanel; +import org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.ThemeChooser; +import org.apache.isis.viewer.wicket.ui.pages.about.AboutPage; +import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract; + /** * A panel for the default page footer */ http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html ---------------------------------------------------------------------- diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html index 9bb2684..83824a1 100644 --- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html +++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.html @@ -21,11 +21,10 @@ <body> <wicket:panel> <span class="breadcrumbPanel"> -<<<<<<< HEAD <select wicket:id="breadcrumbs" class="autoComplete form-control select2-remote" style="width: 100%"></select> -======= +<!-- <input wicket:id="breadcrumbs" type="hidden" class="autoComplete select2-remote" style="width: 100%; padding: 0" /> ->>>>>>> ISIS-1223-upgrade-to-wicket-7 +--> </span> </wicket:panel> </body> http://git-wip-us.apache.org/repos/asf/isis/blob/f6f10e34/example/application/simpleapp/pom.xml ---------------------------------------------------------------------- diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index 1c15b91..1bbb74a 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -34,7 +34,7 @@ </prerequisites> <properties> - <isis.version>1.13.1-SNAPSHOT</isis.version> + <isis.version>1.14.0-SNAPSHOT</isis.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
