You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/10/28 07:33:21 UTC
[18/21] isis git commit: ISIS-1223: merges remote-tracking branch
'origin/ISIS-1223-upgrade-to-wicket-7'
ISIS-1223: merges remote-tracking branch 'origin/ISIS-1223-upgrade-to-wicket-7'
# Fixed conflicts:
# core/pom.xml
# core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
# core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/04d8842f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/04d8842f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/04d8842f
Branch: refs/heads/master
Commit: 04d8842f8a162e60a94d303296dc2c0218071348
Parents: 3b2c552 0840943
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Oct 27 10:47:49 2016 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Oct 27 10:47:49 2016 +0200
----------------------------------------------------------------------
core/pom.xml | 19 ++++--
core/viewer-wicket-applib/pom.xml | 18 +++---
.../wicket/viewer/IsisWicketApplication.java | 43 +++++++++++--
.../viewer/settings/IsisResourceSettings.java | 15 +++--
core/viewer-wicket-model/pom.xml | 16 ++---
.../model/models/BookmarkedPagesModel.java | 2 +-
.../components/about/JarManifestListView.java | 4 +-
.../IsisAjaxFallbackOrderByBorder.java | 3 +-
.../scalars/IsisConverterLocator.java | 4 +-
.../scalars/jdkmath/BigIntegerConverter.java | 68 --------------------
.../jdkmath/JavaMathBigIntegerPanel.java | 5 +-
.../reference/EntityLinkSelect2Panel.java | 2 +-
.../select2/Select2BootstrapCssReference.java | 5 +-
.../widgets/select2/Select2ChoiceUtil.java | 7 +-
.../widgets/select2/Select2JsReference.java | 5 +-
.../wicket/ui/errors/StackTraceListView.java | 4 +-
.../wicket/ui/pages/login/IsisSignInPanel.html | 2 +-
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 6 +-
.../viewer/wicket/ui/panels/FormAbstract.java | 7 +-
.../viewer/wicket/ui/panels/PanelAbstract.java | 7 +-
20 files changed, 114 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/pom.xml
----------------------------------------------------------------------
diff --cc core/pom.xml
index a02eaad,c958782..ceec979
--- a/core/pom.xml
+++ b/core/pom.xml
@@@ -133,29 -133,28 +133,30 @@@
<!-- using 2.3.2 throws strange error about not finding org.hsqldb.jdbcDriver -->
<!-- using 2.3.3 throws SQL exception in simpleapp integtests -->
- <hsqldb.version>2.3.1</hsqldb.version>
+ <hsqldb.version>2.3.4</hsqldb.version>
<log4jdbc-remix.version>0.2.7</log4jdbc-remix.version>
- <resteasy-jaxrs.version>3.0.14.Final</resteasy-jaxrs.version>
+ <resteasy-jaxrs.version>3.0.17.Final</resteasy-jaxrs.version>
- <jetty.version>9.3.6.v20151106</jetty.version>
+ <jetty.version>9.3.10.v20160621</jetty.version>
- <wicket.version>6.23.0</wicket.version>
+ <wicket.version>7.3.0</wicket.version>
- <wicketstuff.version>7.3.0</wicketstuff.version>
- <wicket-webjars.version>0.4.9</wicket-webjars.version>
- <wicket-bootstrap.version>0.9.16</wicket-bootstrap.version>
- <wicket-source.version>6.0.0.8</wicket-source.version>
+ <wicket-webjars.version>0.5.4</wicket-webjars.version>
+ <wicket-bootstrap.version>0.10.7</wicket-bootstrap.version>
+ <wicket-source.version>7.0.0</wicket-source.version>
+
++ <wicketstuff.version>7.3.0</wicketstuff.version>
+ <select2.version>4.0.0-2</select2.version>
+
- <wicket-select2.version>6.23.0</wicket-select2.version>
- <select2.version>3.5.4</select2.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
- <guice.version>4.0</guice.version>
+ <guice.version>4.1.0</guice.version>
<picocontainer.version>2.15</picocontainer.version>
+
<dom4j.version>1.6.1</dom4j.version>
<jdom.version>2.0.2</jdom.version>
- <xstream.version>1.4.8</xstream.version>
+ <xstream.version>1.4.9</xstream.version>
<htmlparser.version>2.1</htmlparser.version>
<junit.version>4.12</junit.version>
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-applib/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index c40b7d9,0f78f39..e3dedd5
--- 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
@@@ -23,50 -23,25 +23,51 @@@ import java.util.Collections
import java.util.List;
import java.util.ServiceLoader;
import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
-import javax.servlet.ServletContext;
+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.Injector;
+import com.google.inject.Module;
+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.authentication.IAuthenticationStrategy;
+import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
+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.IRequestCycleSettings.RenderStrategy;
+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.authentication.AuthenticationSessionProvider;
-import org.apache.isis.core.commons.authentication.AuthenticationSessionProviderAware;
import org.apache.isis.core.commons.config.IsisConfiguration;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
-import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStreams;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceComposite;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceCurrentClassClassPath;
-import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
+import org.apache.isis.core.commons.config.IsisConfigurationDefault;
+import org.apache.isis.core.commons.configbuilder.IsisConfigurationBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.deployment.DeploymentCategory;
-import org.apache.isis.core.metamodel.deployment.DeploymentCategoryProvider;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
import org.apache.isis.core.runtime.logging.IsisLoggingConfigurer;
import org.apache.isis.core.runtime.runner.IsisInjectModule;
@@@ -410,11 -320,10 +442,10 @@@ public class IsisWicketApplicatio
ApplicationSettings select2Settings = ApplicationSettings.get();
select2Settings.setCssReference(new Select2BootstrapCssReference());
select2Settings.setJavaScriptReference(new Select2JsReference());
- select2Settings.setIncludeJqueryUI(false);
}
- protected void configureWicketSourcePluginIfNecessary(final IsisConfiguration configuration) {
- if(isWicketSourcePluginEnabled(configuration)) {
+ protected void configureWicketSourcePluginIfNecessary() {
+ if(isWicketSourcePluginEnabled(this.configuration)) {
configureWicketSourcePlugin();
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-model/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index af9aff2,077c0d6..6d46269
--- a/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/core/viewer-wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@@ -22,17 -22,15 +22,17 @@@ package org.apache.isis.viewer.wicket.m
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
+
import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.core.runtime.system.context.IsisContext;
- public class BookmarkedPagesModel extends ModelAbstract<List<? extends BookmarkTreeNode>> {
+ public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
index 955cfb5,5c6531f..f1254cb
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/mmverror/MmvErrorPage.java
@@@ -79,11 -76,7 +79,11 @@@ public class MmvErrorPage extends WebPa
private static final String ID_ERROR = "error";
private static final String ID_ERROR_MESSAGE = "errorMessage";
+ public MmvErrorPage(Set<String> validationErrors) {
+ this(Model.ofList(Lists.newArrayList(validationErrors)));
+ }
+
- public MmvErrorPage(final IModel<List<? extends String>> model) {
+ public MmvErrorPage(final IModel<List<String>> model) {
super(model);
addPageTitle();
addApplicationName();
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index 3335a45,95e715a..00d5fe0
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@@ -19,7 -19,8 +19,12 @@@
package org.apache.isis.viewer.wicket.ui.panels;
++<<<<<<< HEAD
+import org.apache.wicket.markup.html.IHeaderContributor;
++=======
+ import java.util.List;
+
++>>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.model.IModel;
@@@ -36,7 -42,8 +41,7 @@@ import org.apache.isis.viewer.wicket.ui
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
public abstract class FormAbstract<T> extends Form<T>
- implements IHeaderContributor, ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
- implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor,
- AuthenticationSessionProvider, DeploymentCategoryProvider, PersistenceSessionProvider {
++ implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/04d8842f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
----------------------------------------------------------------------
diff --cc core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
index a7ce4bb,2d07889..c1463da
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelAbstract.java
@@@ -20,7 -20,7 +20,11 @@@
package org.apache.isis.viewer.wicket.ui.panels;
import org.apache.wicket.Component;
++<<<<<<< HEAD
+import org.apache.wicket.markup.html.IHeaderContributor;
++=======
+ import org.apache.wicket.Session;
++>>>>>>> origin/ISIS-1223-upgrade-to-wicket-7
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@@ -49,8 -51,8 +53,7 @@@ import de.agilecoders.wicket.extensions
* Convenience adapter for {@link Panel}s built up using {@link ComponentType}s.
*/
// TODO mgrigorov: extend GenericPanel and make T the type of the model object, not the model
- public abstract class PanelAbstract<T extends IModel<?>> extends Panel
- implements IHeaderContributor {
-public abstract class PanelAbstract<T extends IModel<?>> extends Panel implements PersistenceSessionProvider, AuthenticationSessionProvider,
- DeploymentCategoryProvider {
++public abstract class PanelAbstract<T extends IModel<?>> extends Panel {
private static final long serialVersionUID = 1L;