From 1b1a7f373b3d1e4d9d17cb46d3fb0059b0732b82 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 17 Jul 2016 13:30:43 +0600 Subject: [PATCH 001/139] [urlfragment] Java warnings were fixed --- urlfragment-parent/urlfragment-example/pom.xml | 2 -- .../urlfragment/example/asyncpage/AsyncHomePage.java | 1 + .../urlfragment/example/asyncpage/ContentPanel.html | 5 ++++- .../urlfragment/example/asyncpage/ContentPanel.java | 8 +++++++- .../urlfragment/example/asyncpanel/AsyncContentPanel.html | 5 ++++- .../urlfragment/example/asyncpanel/AsyncContentPanel.java | 4 +++- .../urlfragment/example/asyncpanel/HomePage.java | 1 + urlfragment-parent/urlfragment/pom.xml | 1 - .../urlfragment/AsyncUrlFragmentAwarePage.java | 4 +++- .../urlfragment/AsyncUrlFragmentAwarePanel.java | 3 ++- .../wicketstuff/urlfragment/BookmarkableAjaxButton.java | 2 +- .../org/wicketstuff/urlfragment/BookmarkableAjaxLink.java | 1 + .../urlfragment/CrawlableAsyncUrlFragmentAwarePage.java | 1 + .../urlfragment/UrlParametersReceivingBehavior.java | 2 +- 14 files changed, 29 insertions(+), 11 deletions(-) diff --git a/urlfragment-parent/urlfragment-example/pom.xml b/urlfragment-parent/urlfragment-example/pom.xml index 7c4e75cc54..0aa877b73a 100644 --- a/urlfragment-parent/urlfragment-example/pom.xml +++ b/urlfragment-parent/urlfragment-example/pom.xml @@ -48,7 +48,6 @@ org.apache.wicket wicket-core - ${wicket.version} @@ -83,7 +82,6 @@ org.eclipse.jetty.aggregate jetty-all-server - ${jetty.version} provided diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/AsyncHomePage.java b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/AsyncHomePage.java index 677881bf0d..42f32ca871 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/AsyncHomePage.java +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/AsyncHomePage.java @@ -7,6 +7,7 @@ public class AsyncHomePage extends AsyncUrlFragmentAwarePage { + private static final long serialVersionUID = 1L; @Override protected void onInitialize() diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.html b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.html index 50757a9832..fc098af760 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.html +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.html @@ -1,3 +1,5 @@ + +

parameter 'linkParam' from initial page request (reload page to update):

@@ -11,4 +13,5 @@ - \ No newline at end of file + + diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.java b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.java index 98d65af139..4cc4c77f38 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.java +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpage/ContentPanel.java @@ -16,7 +16,7 @@ public class ContentPanel extends Panel { - + private static final long serialVersionUID = 1L; private final StringValue linkParam; public ContentPanel(String id, IRequestParameters requestParameters) @@ -44,6 +44,7 @@ protected void onInitialize() add(new BookmarkableAjaxLink("setFragment") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -56,6 +57,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) add(new BookmarkableAjaxLink("setFragmentParameter") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -68,6 +70,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) add(new BookmarkableAjaxLink("appendParam") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -80,6 +83,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) add(new BookmarkableAjaxLink("putParam") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -92,6 +96,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) add(new BookmarkableAjaxLink("removeParam") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -108,6 +113,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) form.add(new TextField("formParam", formModel)); form.add(new BookmarkableAjaxButton("submit") { + private static final long serialVersionUID = 1L; @Override protected void onBookmarkableSubmit(AjaxRequestTarget target, Form form) diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.html b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.html index c778c1594b..cd04c249dc 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.html +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.html @@ -1,5 +1,8 @@ + +

ASC

DESC

sorting:

- \ No newline at end of file + + diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.java b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.java index d0d1c416da..15e6650754 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.java +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/AsyncContentPanel.java @@ -10,7 +10,7 @@ public class AsyncContentPanel extends AsyncUrlFragmentAwarePanel { - + private static final long serialVersionUID = 1L; private final IModel sortingModel; private final Label sortingLabel; @@ -26,6 +26,7 @@ public AsyncContentPanel(String id) add(new BookmarkableAjaxLink("zins_asc", "sorting", "zins_asc") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) @@ -38,6 +39,7 @@ public void onBookmarkableClick(AjaxRequestTarget target) add(new BookmarkableAjaxLink("zins_desc", "sorting", "zins_desc") { + private static final long serialVersionUID = 1L; @Override public void onBookmarkableClick(AjaxRequestTarget target) diff --git a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/HomePage.java b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/HomePage.java index 213737731d..14b831b5b7 100644 --- a/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/HomePage.java +++ b/urlfragment-parent/urlfragment-example/src/main/java/org/wicketstuff/urlfragment/example/asyncpanel/HomePage.java @@ -5,6 +5,7 @@ public class HomePage extends WebPage { + private static final long serialVersionUID = 1L; public HomePage(final PageParameters parameters) { diff --git a/urlfragment-parent/urlfragment/pom.xml b/urlfragment-parent/urlfragment/pom.xml index 405bc75908..272a4196c2 100644 --- a/urlfragment-parent/urlfragment/pom.xml +++ b/urlfragment-parent/urlfragment/pom.xml @@ -40,7 +40,6 @@ org.apache.wicket wicket-core - ${wicket.version} diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePage.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePage.java index 5e7ea36873..040d7b3cb9 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePage.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePage.java @@ -45,7 +45,7 @@ */ public abstract class AsyncUrlFragmentAwarePage extends WebPage implements IBookmarkableComponent { - + private static final long serialVersionUID = 1L; private transient AjaxRequestTarget target = null; protected UrlParametersReceivingBehavior urlParametersReceivingBehavior; @@ -70,6 +70,8 @@ protected void onInitialize() super.onInitialize(); urlParametersReceivingBehavior = new UrlParametersReceivingBehavior(getOptions()) { + private static final long serialVersionUID = 1L; + @Override protected void onParameterArrival(IRequestParameters requestParameters, AjaxRequestTarget target) diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePanel.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePanel.java index 970bcd357b..1d4f118db2 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePanel.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/AsyncUrlFragmentAwarePanel.java @@ -44,7 +44,7 @@ */ public abstract class AsyncUrlFragmentAwarePanel extends Panel implements IBookmarkableComponent { - + private static final long serialVersionUID = 1L; private transient AjaxRequestTarget target = null; public AsyncUrlFragmentAwarePanel(String id) @@ -64,6 +64,7 @@ private void initializeFragmentBehavior() this.setOutputMarkupId(true); add(new UrlParametersReceivingBehavior(getOptions()) { + private static final long serialVersionUID = 1L; @Override protected void onParameterArrival(IRequestParameters requestParameters, diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxButton.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxButton.java index 476eb07b7c..b63f88c433 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxButton.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxButton.java @@ -31,7 +31,7 @@ */ public abstract class BookmarkableAjaxButton extends AjaxButton implements IBookmarkableComponent { - + private static final long serialVersionUID = 1L; private transient AjaxRequestTarget target = null; public BookmarkableAjaxButton(String id) diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxLink.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxLink.java index 760ce2bdbc..b5b242f22b 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxLink.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/BookmarkableAjaxLink.java @@ -33,6 +33,7 @@ */ public abstract class BookmarkableAjaxLink extends AjaxLink implements IBookmarkableComponent { + private static final long serialVersionUID = 1L; private transient AjaxRequestTarget target = null; diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/CrawlableAsyncUrlFragmentAwarePage.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/CrawlableAsyncUrlFragmentAwarePage.java index a8f31b17b8..0074cc0d48 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/CrawlableAsyncUrlFragmentAwarePage.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/CrawlableAsyncUrlFragmentAwarePage.java @@ -24,6 +24,7 @@ */ public abstract class CrawlableAsyncUrlFragmentAwarePage extends AsyncUrlFragmentAwarePage { + private static final long serialVersionUID = 1L; @Override protected void onInitialize() diff --git a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/UrlParametersReceivingBehavior.java b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/UrlParametersReceivingBehavior.java index 5499892cf0..df668e243f 100644 --- a/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/UrlParametersReceivingBehavior.java +++ b/urlfragment-parent/urlfragment/src/main/java/org/wicketstuff/urlfragment/UrlParametersReceivingBehavior.java @@ -42,7 +42,7 @@ */ public abstract class UrlParametersReceivingBehavior extends AbstractDefaultAjaxBehavior { - + private static final long serialVersionUID = 1L; private final Component[] components; private final Map options; From 778568d5d2da8a51c5acb56c45830ff0f0041118 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 17 Jul 2016 17:45:45 +0600 Subject: [PATCH 002/139] [dashboard] Java warnings were fixed --- .../dashboard/web/AbstractWidgetAction.java | 8 ++++---- .../dashboard/web/DashboardColumnPanel.java | 12 ++++++++---- .../wicketstuff/dashboard/web/WidgetHeaderPanel.java | 9 ++++----- dashboard-parent/dashboard-examples/pom.xml | 1 - .../dashboard/examples/DemoWidgetActionsFactory.java | 2 -- .../dashboard/examples/jqplot/DemoChartFactory.java | 3 ++- .../charts/settings/HighChartsSettingsPanel.html | 4 ++-- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/AbstractWidgetAction.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/AbstractWidgetAction.java index df17aa677e..acfe300de4 100644 --- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/AbstractWidgetAction.java +++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/AbstractWidgetAction.java @@ -24,10 +24,10 @@ * @author Decebal Suiu */ public abstract class AbstractWidgetAction implements WidgetAction { - - protected Widget widget; + private static final long serialVersionUID = 1L; + protected Widget widget; protected IModel tooltip; - private Class imageScope; + private Class imageScope; private String imageName; public AbstractWidgetAction(Widget widget) { @@ -53,7 +53,7 @@ public void setTooltip(IModel tooltip) { * @param scope * @param name */ - public void setImage(Class scope, String name) { + public void setImage(Class scope, String name) { imageScope = scope; imageName = name; } diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/DashboardColumnPanel.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/DashboardColumnPanel.java index a8addc8227..cf64941aa8 100644 --- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/DashboardColumnPanel.java +++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/DashboardColumnPanel.java @@ -12,12 +12,14 @@ */ package org.wicketstuff.dashboard.web; +import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.event.Broadcast; import org.apache.wicket.markup.head.IHeaderResponse; @@ -122,10 +124,12 @@ public void renderHead(IHeaderResponse response) { vars.put("component", get("columnContainer").getMarkupId()); vars.put("stopBehavior", script.toString()); - PackageTextTemplate template = new PackageTextTemplate(DashboardColumnPanel.class, "res/sort-behavior.template.js"); - template.interpolate(vars); - - response.render(OnDomReadyHeaderItem.forScript(template.getString())); + try (PackageTextTemplate template = new PackageTextTemplate(DashboardColumnPanel.class, "res/sort-behavior.template.js");) { + template.interpolate(vars); + response.render(OnDomReadyHeaderItem.forScript(template.getString())); + } catch (IOException e) { + throw new WicketRuntimeException(e); + } } /* diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java index a383a256f5..25837ce739 100644 --- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java +++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java @@ -20,7 +20,6 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.panel.GenericPanel; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.resource.PackageResourceReference; @@ -43,8 +42,9 @@ public WidgetHeaderPanel(String id, IModel model) { setMarkupId("header-" + getModelObject().getId()); final Image toggle = new Image("toggle", "") { + private static final long serialVersionUID = 1L; - @Override + @Override protected ResourceReference getImageResourceReference() { String name = getWidget().isCollapsed() ? "res/up.png" : "res/down.png"; @@ -78,8 +78,7 @@ protected void onEvent(AjaxRequestTarget target) { } }); - toggle.add(new AttributeModifier("title", new AbstractReadOnlyModel() { - + toggle.add(new AttributeModifier("title", new IModel() { private static final long serialVersionUID = 1L; @Override @@ -90,7 +89,7 @@ public String getObject() { })); add(toggle); - add(new Label("title", new PropertyModel(model, "title"))); + add(new Label("title", new PropertyModel(model, "title"))); WidgetActionsPanel actionsPanel = new WidgetActionsPanel("actions", model); add(actionsPanel); diff --git a/dashboard-parent/dashboard-examples/pom.xml b/dashboard-parent/dashboard-examples/pom.xml index aed76c6803..9b6da12098 100644 --- a/dashboard-parent/dashboard-examples/pom.xml +++ b/dashboard-parent/dashboard-examples/pom.xml @@ -115,7 +115,6 @@ org.eclipse.jetty.aggregate jetty-all-server - ${jetty.version} test diff --git a/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/DemoWidgetActionsFactory.java b/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/DemoWidgetActionsFactory.java index 838c587b9d..86aa5f6f70 100644 --- a/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/DemoWidgetActionsFactory.java +++ b/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/DemoWidgetActionsFactory.java @@ -17,8 +17,6 @@ import org.wicketstuff.dashboard.DefaultWidgetActionsFactory; import org.wicketstuff.dashboard.Widget; import org.wicketstuff.dashboard.WidgetAction; -import org.wicketstuff.dashboard.web.AbstractWidgetAction; -import org.wicketstuff.dashboard.web.DefaultWidgetActions; /** * @author Decebal Suiu diff --git a/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/jqplot/DemoChartFactory.java b/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/jqplot/DemoChartFactory.java index 0b39eb68ef..91c1d45e37 100644 --- a/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/jqplot/DemoChartFactory.java +++ b/dashboard-parent/dashboard-examples/src/main/java/org/wicketstuff/dashboard/examples/jqplot/DemoChartFactory.java @@ -70,7 +70,8 @@ public static Chart areaChart() { return areaChart; } - public static Chart barChart() { + @SuppressWarnings("deprecation") + public static Chart barChart() { BarChart barChart; barChart = new BarChart("Bar Chart"); diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/settings/HighChartsSettingsPanel.html b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/settings/HighChartsSettingsPanel.html index cd0cef5ca3..7c6597bd3d 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/settings/HighChartsSettingsPanel.html +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/src/main/java/org/wicketstuff/dashboard/widgets/charts/settings/HighChartsSettingsPanel.html @@ -6,8 +6,8 @@ Save Cancel -
+
Visit the HighCharts demo site for a full list of chart types. - \ No newline at end of file + From 2df981d3f76f183b74ad60127ec94f3854948b8c Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 17 Jul 2016 18:52:07 +0600 Subject: [PATCH 003/139] [dashboard] Fixes #528: wicket.properties is replaced with META-INF/services/org.apache.wicket.IInitializer --- dashboard-parent/dashboard-core/src/main/java/wicket.properties | 1 - .../resources/META-INF/services/org.apache.wicket.IInitializer | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 dashboard-parent/dashboard-core/src/main/java/wicket.properties create mode 100644 dashboard-parent/dashboard-core/src/main/resources/META-INF/services/org.apache.wicket.IInitializer diff --git a/dashboard-parent/dashboard-core/src/main/java/wicket.properties b/dashboard-parent/dashboard-core/src/main/java/wicket.properties deleted file mode 100644 index 53fdedc51d..0000000000 --- a/dashboard-parent/dashboard-core/src/main/java/wicket.properties +++ /dev/null @@ -1 +0,0 @@ -initializer=org.wicketstuff.dashboard.DashboardContextInitializer \ No newline at end of file diff --git a/dashboard-parent/dashboard-core/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/dashboard-parent/dashboard-core/src/main/resources/META-INF/services/org.apache.wicket.IInitializer new file mode 100644 index 0000000000..a5edce3833 --- /dev/null +++ b/dashboard-parent/dashboard-core/src/main/resources/META-INF/services/org.apache.wicket.IInitializer @@ -0,0 +1 @@ +org.wicketstuff.dashboard.DashboardContextInitializer \ No newline at end of file From 48d919ecbcf3f08e1892761235bbbb762219a9ec Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 17 Jul 2016 19:03:05 +0600 Subject: [PATCH 004/139] versions are updated --- jqplot-parent/jqplot/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jqplot-parent/jqplot/pom.xml b/jqplot-parent/jqplot/pom.xml index 918263bda4..a58f9add0b 100644 --- a/jqplot-parent/jqplot/pom.xml +++ b/jqplot-parent/jqplot/pom.xml @@ -15,7 +15,7 @@ JqPlot Plugin Integration for Apache Wicket - 1.4.5 + 1.4.9 @@ -57,7 +57,7 @@ br.com.digilabs.jqplot jqplot4java - 1.3.0 + 1.3.1 From d193b4a8d51796bbfa5d00bd7439b25a86ef27c7 Mon Sep 17 00:00:00 2001 From: Joachim Rohde Date: Sat, 23 Jul 2016 18:51:11 +0200 Subject: [PATCH 005/139] [GMap3] Fixed #530 (used wrong parameter name for the key) --- .../main/java/org/wicketstuff/gmap/GMapHeaderContributor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/GMapHeaderContributor.java b/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/GMapHeaderContributor.java index c1bb58b3d1..ec41726aa4 100644 --- a/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/GMapHeaderContributor.java +++ b/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/GMapHeaderContributor.java @@ -94,7 +94,7 @@ public void renderHead(Component component, IHeaderResponse response) String url = String.format(GMAP_API_URL, scheme); if (apiKey != null) { - url = url + "apiKey=" + apiKey; + url = url + "key=" + apiKey; } response.render(JavaScriptHeaderItem.forUrl(url)); } From f466d7650eb86a50802b98aa1c48adef5c973ada Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 27 Jul 2016 14:30:24 +0200 Subject: [PATCH 006/139] [dashboard] Fix build in wicket-7.x --- .../java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java index 25837ce739..b769a2aa90 100644 --- a/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java +++ b/dashboard-parent/dashboard-core/src/main/java/org/wicketstuff/dashboard/web/WidgetHeaderPanel.java @@ -21,6 +21,7 @@ import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; @@ -78,7 +79,7 @@ protected void onEvent(AjaxRequestTarget target) { } }); - toggle.add(new AttributeModifier("title", new IModel() { + toggle.add(new AttributeModifier("title", new AbstractReadOnlyModel() { private static final long serialVersionUID = 1L; @Override From 79948f88a7025f783b2645a48a827b5858ef9942 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 27 Jul 2016 14:31:26 +0200 Subject: [PATCH 007/139] [jqplot] Fix build in wicket-7.x --- .../java/org/wicketstuff/jqplot/examples/HomePage.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java b/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java index 356181b8a0..cfb98cf399 100644 --- a/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java +++ b/jqplot-parent/jqplot-examples/src/main/java/org/wicketstuff/jqplot/examples/HomePage.java @@ -64,7 +64,7 @@ private void addChartWithImage() { Legend legend = new Legend(); legend.setShow(true); - legend.setPlacment("outsite"); + legend.setPlacement("outsite"); legend.setRendererOptions(new LegendRenderer().setNumberRows(1)); legend.setLocation(Location.s); legend.setMarginTop("15px"); @@ -135,7 +135,7 @@ public AreaChart areaChart2() { Legend legend = new Legend(); legend.setShow(true); - legend.setPlacment("outsideGrid"); + legend.setPlacement("outsideGrid"); areaChart.setLegend(legend); TickOptions tickOptions = new TickOptions(); @@ -156,7 +156,7 @@ private PieChart pieChart2() { Legend legend = new Legend(); legend.setShow(true); - legend.setPlacment("outsite"); + legend.setPlacement("outsite"); legend.setRendererOptions(new LegendRenderer().setNumberRows(1)); legend.setLocation(Location.s); legend.setMarginTop("15px"); @@ -270,7 +270,7 @@ private BarChart barChart1() { BarChart barChart1 = new BarChart("Bar Chart"); Legend legend = new Legend(); legend.setShow(true); - legend.setPlacment("outsideGrid"); + legend.setPlacement("outsideGrid"); barChart1.setLegend(legend); barChart1 .getChartConfiguration() From 85eb488859cbcfca9545d9004169eabc6320f40a Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 27 Jul 2016 14:49:59 +0200 Subject: [PATCH 008/139] Build against Wicket 7.5.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 403c61d94a..a1a7212254 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 1.7 1.7 From 68fe53f3432a589645e39dc22e529d3c9cb1674f Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Thu, 4 Aug 2016 20:25:30 +0300 Subject: [PATCH 009/139] make the bridge schema(http/https) aware #531 --- .../apache/wicket/portlet/PortletFilter.java | 346 ++-- .../apache/wicket/portlet/WicketPortlet.java | 1438 ++++++++--------- 2 files changed, 904 insertions(+), 880 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java index a91213090b..c482e85e2a 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java @@ -1,161 +1,185 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.portlet; - -import java.io.IOException; - -import javax.portlet.PortletConfig; -import javax.portlet.PortletRequest; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.apache.wicket.IPageRendererProvider; -import org.apache.wicket.IRequestCycleProvider; -import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.protocol.http.WicketFilter; -import org.apache.wicket.request.UrlRenderer; -import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.request.cycle.RequestCycleContext; -import org.apache.wicket.request.handler.render.PageRenderer; -import org.apache.wicket.request.http.WebResponse; -import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException; -import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy; -import org.apache.wicket.util.crypt.Base64; - -/** - * This class subclasses the original WicketFilter to add the necessary porlet - * functionality. It is responsible for the initialization of all portlet - * specific settings of the WebApplication and wraps the portlet request and - * portlet response objects by an http servlet request / response wrapper. - * - * @author Peter Pastrnak - * @author Konstantinos Karavitis - */ -public class PortletFilter extends WicketFilter { - public static final String SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX = "/ps:"; - - private static String NOT_MOUNTED_PATH = "notMountedPath"; - - private FilterConfig filterConfig; - - @Override - public void init(boolean isServlet, FilterConfig filterConfig) throws ServletException { - super.init(isServlet, filterConfig); - this.filterConfig = filterConfig; - getApplication().getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER); - getApplication().getRequestCycleSettings().addResponseFilter(new PortletInvalidMarkupFilter()); - //fix for https://github.com/wicketstuff/core/issues/487 - getApplication().getMarkupSettings().setMarkupIdGenerator(new PortletMarkupIdGenerator()); - getApplication().setRootRequestMapper(new PortletRequestMapper(getApplication())); - //Application must use the portlet specific page renderer provider. - getApplication().setPageRendererProvider(new IPageRendererProvider() { - @Override - public PageRenderer get(RenderPageRequestHandler handler) { - return new PortletPageRenderer(handler); - } - }); - // fix for https://github.com/wicketstuff/core/issues/478 issue - getApplication().setRequestCycleProvider(new IRequestCycleProvider() { - @Override - public RequestCycle get(RequestCycleContext context) { - return new RequestCycle(context) { - @Override - protected UrlRenderer newUrlRenderer() { - return new PortletUrlRenderer(getRequest()); - } - }; - } - }); - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; - HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; - String filterPath = getFilterPath(httpServletRequest); - - PortletRequest portletRequest = (PortletRequest) httpServletRequest.getAttribute("javax.portlet.request"); - if (portletRequest != null) { - final PortletConfig portletConfig = (PortletConfig) httpServletRequest.getAttribute("javax.portlet.config"); - final ResponseState responseState = (ResponseState) httpServletRequest.getAttribute(WicketPortlet.RESPONSE_STATE_ATTR); - - if (portletConfig != null) { - if (responseState == null) { - filterChain.doFilter(httpServletRequest, httpServletResponse); - return; - } - - HttpSession proxiedSession = PortletHttpSessionWrapper.createProxy( - httpServletRequest, portletRequest.getWindowID(), getApplication() - .getSessionAttributePrefix(null, filterConfig.getFilterName())); - - httpServletRequest = new PortletServletRequestWrapper(filterConfig.getServletContext(), httpServletRequest, proxiedSession, filterPath); - httpServletResponse = new PortletServletResponseWrapper(httpServletResponse, responseState); - } - } - else { - // look for windowId and serve it as a shared resource - - String pathInfo = httpServletRequest.getRequestURI().substring(httpServletRequest.getContextPath().length() + filterPath.length()); - if (pathInfo.startsWith(SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX)) { - - int nextSeparator = pathInfo.indexOf('/', 1); - if (nextSeparator > 0) { - String windowId = new String(Base64.decodeBase64(pathInfo.substring(SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX.length(), nextSeparator))); - - HttpSession proxiedSession = PortletHttpSessionWrapper.createProxy( - httpServletRequest, - windowId, - getApplication().getSessionAttributePrefix(null, - filterConfig.getFilterName())); - - pathInfo = pathInfo.substring(nextSeparator); - httpServletRequest = new PortletServletRequestWrapper(filterConfig.getServletContext(), httpServletRequest, proxiedSession, filterPath, pathInfo); - } - } - } - - super.doFilter(httpServletRequest, httpServletResponse, filterChain); - } - - protected boolean processRequestCycle(RequestCycle requestCycle, WebResponse webResponse, - HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, final FilterChain chain) - throws IOException, ServletException { - // Assume we are able to handle the request - boolean res = true; - - if (requestCycle.processRequestAndDetach()) { - webResponse.flush(); - } else if (httpServletRequest.getPathInfo() != null - && httpServletRequest.getPathInfo().equals(httpServletRequest.getAttribute(NOT_MOUNTED_PATH))) { - throw new AbortWithHttpErrorCodeException(404, httpServletRequest.getPathInfo() + " is not mounted to any Page"); - } else { - if (chain != null) { - httpServletRequest.setAttribute(NOT_MOUNTED_PATH, httpServletRequest.getPathInfo()); - chain.doFilter(httpServletRequest, httpServletResponse); - } - res = false; - } - return res; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.portlet; + +import java.io.IOException; + +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.wicket.IPageRendererProvider; +import org.apache.wicket.IRequestCycleProvider; +import org.apache.wicket.core.request.handler.RenderPageRequestHandler; +import org.apache.wicket.protocol.http.WicketFilter; +import org.apache.wicket.protocol.https.HttpsConfig; +import org.apache.wicket.protocol.https.HttpsMapper; +import org.apache.wicket.protocol.https.Scheme; +import org.apache.wicket.request.IRequestHandler; +import org.apache.wicket.request.Request; +import org.apache.wicket.request.UrlRenderer; +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.cycle.RequestCycleContext; +import org.apache.wicket.request.handler.render.PageRenderer; +import org.apache.wicket.request.http.WebResponse; +import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException; +import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy; +import org.apache.wicket.util.crypt.Base64; + +/** + * This class subclasses the original WicketFilter to add the necessary porlet + * functionality. It is responsible for the initialization of all portlet + * specific settings of the WebApplication and wraps the portlet request and + * portlet response objects by an http servlet request / response wrapper. + * + * @author Peter Pastrnak + * @author Konstantinos Karavitis + */ +public class PortletFilter extends WicketFilter { + public static final String SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX = "/ps:"; + + private static String NOT_MOUNTED_PATH = "notMountedPath"; + + private FilterConfig filterConfig; + + @Override + public void init(boolean isServlet, FilterConfig filterConfig) throws ServletException { + super.init(isServlet, filterConfig); + this.filterConfig = filterConfig; + + getApplication().getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER); + getApplication().getRequestCycleSettings().addResponseFilter(new PortletInvalidMarkupFilter()); + //fix for https://github.com/wicketstuff/core/issues/487 + getApplication().getMarkupSettings().setMarkupIdGenerator(new PortletMarkupIdGenerator()); + + //make the wicket bridge schema (HTTPS/HTTP) aware + getApplication().setRootRequestMapper(new HttpsMapper(new PortletRequestMapper(getApplication()), new HttpsConfig()){ + @Override + protected Scheme getDesiredSchemeFor(IRequestHandler handler) { + Request request = RequestCycle.get().getRequest(); + return super.getSchemeOf(request); + } + }); + + //Application must use the portlet specific page renderer provider. + getApplication().setPageRendererProvider(new IPageRendererProvider() { + @Override + public PageRenderer get(RenderPageRequestHandler handler) { + return new PortletPageRenderer(handler); + } + }); + // fix for https://github.com/wicketstuff/core/issues/478 issue + getApplication().setRequestCycleProvider(new IRequestCycleProvider() { + @Override + public RequestCycle get(RequestCycleContext context) { + return new RequestCycle(context) { + @Override + protected UrlRenderer newUrlRenderer() { + return new PortletUrlRenderer(getRequest()); + } + }; + } + }); + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest; + HttpServletResponse httpServletResponse = (HttpServletResponse) servletResponse; + String filterPath = getFilterPath(httpServletRequest); + + PortletRequest portletRequest = (PortletRequest) httpServletRequest.getAttribute("javax.portlet.request"); + if (portletRequest != null) { + final PortletConfig portletConfig = (PortletConfig) httpServletRequest.getAttribute("javax.portlet.config"); + final ResponseState responseState = (ResponseState) httpServletRequest.getAttribute(WicketPortlet.RESPONSE_STATE_ATTR); + + if (portletConfig != null) { + if (responseState == null) { + filterChain.doFilter(httpServletRequest, httpServletResponse); + return; + } + + HttpSession proxiedSession = PortletHttpSessionWrapper.createProxy( + httpServletRequest, portletRequest.getWindowID(), getApplication() + .getSessionAttributePrefix(null, filterConfig.getFilterName())); + + httpServletRequest = new PortletServletRequestWrapper(filterConfig.getServletContext(), httpServletRequest, proxiedSession, filterPath); + httpServletResponse = new PortletServletResponseWrapper(httpServletResponse, responseState); + } + } + else { + // look for windowId and serve it as a shared resource + + String pathInfo = httpServletRequest.getRequestURI().substring(httpServletRequest.getContextPath().length() + filterPath.length()); + if (pathInfo.startsWith(SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX)) { + + int nextSeparator = pathInfo.indexOf('/', 1); + if (nextSeparator > 0) { + String windowId = new String(Base64.decodeBase64(pathInfo.substring(SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX.length(), nextSeparator))); + + HttpSession proxiedSession = PortletHttpSessionWrapper.createProxy( + httpServletRequest, + windowId, + getApplication().getSessionAttributePrefix(null, + filterConfig.getFilterName())); + + pathInfo = pathInfo.substring(nextSeparator); + httpServletRequest = new PortletServletRequestWrapper(filterConfig.getServletContext(), httpServletRequest, proxiedSession, filterPath, pathInfo); + } + } + } + + super.doFilter(httpServletRequest, httpServletResponse, filterChain); + } + + protected boolean processRequestCycle(RequestCycle requestCycle, WebResponse webResponse, + HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, final FilterChain chain) + throws IOException, ServletException { + // Assume we are able to handle the request + boolean res = true; + + if (requestCycle.processRequestAndDetach()) { + webResponse.flush(); + } else if (httpServletRequest.getPathInfo() != null + && httpServletRequest.getPathInfo().equals(httpServletRequest.getAttribute(NOT_MOUNTED_PATH))) { + throw new AbortWithHttpErrorCodeException(404, httpServletRequest.getPathInfo() + " is not mounted to any Page"); + } else { + if (chain != null) { + httpServletRequest.setAttribute(NOT_MOUNTED_PATH, httpServletRequest.getPathInfo()); + chain.doFilter(httpServletRequest, httpServletResponse); + } + res = false; + } + return res; + } + + private void test() { + try { + super.init(null); + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java index 6c5f881cb6..dcdecfcc93 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java @@ -1,719 +1,719 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.portlet; - -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.regex.Pattern; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.GenericPortlet; -import javax.portlet.MimeResponse; -import javax.portlet.PortletConfig; -import javax.portlet.PortletException; -import javax.portlet.PortletMode; -import javax.portlet.PortletRequest; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletResponse; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; -import javax.portlet.ResourceRequest; -import javax.portlet.ResourceResponse; -import javax.servlet.RequestDispatcher; - -import org.apache.wicket.protocol.http.WicketFilter; -import org.apache.wicket.util.file.File; -import org.apache.wicket.util.string.Strings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Adapter between the Portlet world requests and the internal Wicket engine. - * I.e. simulates the web/servlet environment for Wicket, while it's actually - * running as a Portlet. - * - *

- * It receives a portlet request and dispatches to a a Wicket filter; wrapping - * the servlet context, request and response objects; intercepts response - * writing (especially urls and redirects) and rewrites and adapts the output to - * accommodate the portlet requirements. - * - *

- * The WicketPortlet is configured (using an initParameter) against a specific - * filter path, e.g. Wicket WebApplication. The WicketPortlet maintains a - * parameter for the current Wicket page URL being requested as a URL parameter, - * based against the filter path (e.g. fully qualified to the context path). - * When a request (action, render or direct resource/ajax call) is received by - * the WicketPortlet, it dispatches it to Wicket core as a filter request using - * the provided Wicket page URL parameter. - * - * @see WicketPortlet#WICKET_URL_PORTLET_PARAMETER - * @see WicketFilter - * - * @author Ate Douma - * @author Sebastian Thomschke - * @author Peter Pastrnak - * @author Konstantinos Karavitis - */ -public class WicketPortlet extends GenericPortlet { - private static final Pattern PROTECTED_RESOURCES = Pattern.compile("\\A\\s*[/\\\\]*\\s*(WEB|META)[-]INF(.*)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); - - private static final Pattern ABSOLUTE_URI_PATTERN = Pattern.compile("([a-z][a-z0-9]*://|/).*"); - - public static enum PageType { - ACTION("actionPage"), // - CUSTOM("customPage"), // - EDIT("editPage"), // - HELP("helpPage"), // - VIEW("viewPage"); - - public static PageType getByInitParameterName(final String initParameterName) { - for (final PageType p : PageType.values()) - if (p.initParameterName.equals(initParameterName)) - return p; - return null; - } - - public final String initParameterName; - - PageType(final String initParameterName) { - this.initParameterName = initParameterName; - } - } - - private static final Logger LOG = LoggerFactory.getLogger(WicketPortlet.class); - - /** - * FIXME javadoc - * - *

- * The prefix for the parameter name for storing Wicket URLs. - * - *

- * The actual Wicket URLs generated by Wicket are passed around in portal - * URLs, encoded by the portal (as a URL parameter of this name). The Wicket - * URL is later decoded on subsequent requests, from the portal URL, so that - * we know where to route the request, once it's passed out of the 'portal' - * realm and into the 'Wicket' realm. - * - *

- * This is also used in generating links by {@link PortletRequestContext} in - * generating links, as the links have to be portal encoded links, but must - * also still contain the original wicket url for use by Wicket (e.g. - * {@link PortletRequestContext#encodeActionURL}). - * - *

- * The default/buildin name of the parameter which stores the name of the - * wicket url is stored under {@link #WICKET_URL_PORTLET_PARAMETER}. It will - * be stored suffixed with the current portlet mode (e.g. view), so that - * render requests know what mode to render. - * - * @see PortletRequestContext - */ - public static final String WICKET_URL_PORTLET_PARAMETER = "_wu"; - - /** - * FIXME javadoc - */ - public static final String WICKET_FILTER_PATH_PARAM = "wicketFilterPath"; - /** - * FIXME javadoc - */ - public static final String RESPONSE_BUFFER_FOLDER_PARAM = "responseBufferFolder"; - /** - * FIXME javadoc - */ - public static final String CONFIG_PARAM_PREFIX = WicketPortlet.class.getName() + "."; - /** - * Marker used as key for the ResponseState object stored as a request - * attribute. - */ - public static final String RESPONSE_STATE_ATTR = ResponseState.class.getName(); - /** FIXME javadoc */ - public static final String WICKET_PORTLET_PROPERTIES = WicketPortlet.class.getName().replace('.', '/') + ".properties"; - - /** FIXME javadoc */ - private String wicketFilterPath; - - /** FIXME javadoc */ - private File responseBufferFolder; - - /** - * A collection of the default URL's for the different view modes of the - * portlet - e.g. VIEW, EDIT, HELP etc... - */ - private final HashMap defaultPages = new HashMap(); - - protected String buildWicketFilterPath(String filterPath) { - if (filterPath == null || filterPath.length() == 0) - return "/"; - - if (!filterPath.startsWith("/")) - filterPath = "/" + filterPath; - if (filterPath.endsWith("*")) - filterPath = filterPath.substring(0, filterPath.length() - 1); - if (!filterPath.endsWith("/")) - filterPath += "/"; - - return filterPath; - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - protected void doCustom(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { - processRequest(request, response, PageType.CUSTOM); - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - @Override - protected void doEdit(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { - processRequest(request, response, PageType.EDIT); - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - @Override - protected void doHelp(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { - processRequest(request, response, PageType.HELP); - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - @Override - protected void doView(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { - processRequest(request, response, PageType.VIEW); - } - - /** - * @param pageType - * the mode of the portlet page, e.g. VIEW, EDIT etc... - * @return the default page name for the given pate type. - */ - protected String getDefaultPage(final PageType pageType) { - return defaultPages.get(pageType); - } - - /** - * Loads the Wicket Portlet properties file off the class path. - * - * FIXME javadoc - check properties - * - * @param properties - * appends the portlet properties to - * @return Wicket portlet properties. Returns an empty or unchanged - * properties object if Wicket Portlet properties could not be found - * @throws PortletException - * if loading the properties fails - */ - protected Properties getWicketPortletProperties(Properties properties) throws PortletException { - if (properties == null) - properties = new Properties(); - final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(WICKET_PORTLET_PROPERTIES); - if (is != null) - try { - properties.load(is); - } - catch (final IOException e) { - throw new PortletException("Failed to load WicketPortlet.properties from classpath", e); - } - return properties; - } - - /** - * Retrieves the Wicket URL from the request object as a request parameter, - * or if none exists returns the default URL. The name of the request - * parameter is stored as a request attribute. - * - *

- * This url is then used to pass on to the matching {@link WicketFilter} to - * process, by way of {@link RequestDispatcher} via the filters context - * path. - * - *

- * A "parameter" is a form field name/value pair passed from the HTML side - * of the world. Its value is a String. - * - *

- * An "attribute" is a Java object name/value pair passed only through the - * internal JavaServer processes. (I.e. it can come from a JSP or servlet - * but not an HTML page.) Its value is an Object. - * - * @see PortletRequestContext#getLastEncodedPath() - * @param request - * @param pageType - * @param defaultPage - * url of the default page - * @return the Wicket URL from within the specified request - */ - protected String getWicketURL(final PortletRequest request, final PageType pageType, final String defaultPage) { - String wicketURL = null; - if (request instanceof ActionRequest) - // try to lookup the passed in wicket url parameter - wicketURL = request.getParameter(WICKET_URL_PORTLET_PARAMETER); - else if (request instanceof ResourceRequest) - wicketURL = ((ResourceRequest) request).getResourceID(); - else { - // try to lookup the passed in wicket url parameter, suffixed with - // the portlet mode - String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + request.getPortletMode().toString(); - String redirectUrl = request.getParameter(redirectUrlKey); - // if the wicket url is not in request parameters try to lookup into the action scoped - // attributes. - wicketURL = redirectUrl == null ? (String)request.getAttribute(redirectUrlKey) : redirectUrl; - } - - // if the wicketURL could not be retrieved, return the url for the - // default page - if (wicketURL == null) - wicketURL = defaultPage; - return wicketURL; - } - - /** - * {@inheritDoc} - */ - @Override - public void init(final PortletConfig config) throws PortletException { - // enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) - config.getContainerRuntimeOptions().put("javax.portlet.actionScopedRequestAttributes", - new String[] { "true", "numberOfCachedScopes", "10" }); - super.init(config); - - wicketFilterPath = buildWicketFilterPath(config.getInitParameter(WICKET_FILTER_PATH_PARAM)); - String responseBufferFolderPath = config.getInitParameter(RESPONSE_BUFFER_FOLDER_PARAM); - if ((responseBufferFolderPath != null) && (!Strings.isEmpty(responseBufferFolderPath))) { - responseBufferFolder = new File(responseBufferFolderPath); - } - - for (final PageType p : PageType.values()) { - defaultPages.put(p, config.getInitParameter(p.initParameterName)); - } - - validateDefaultPages(defaultPages); - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - *

- * Stores the {@link ActionResponse} so that - * {@link PortletEventService#broadcast} can send events using - * {@link ActionResponse#setEvent} - * - * @see PortletEventService#broadcastToPortletListeners - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - @Override - public void processAction(final ActionRequest request, final ActionResponse response) throws PortletException, IOException { - processRequest(request, response, PageType.ACTION); - } - - /** - * Handles redirects set from processing the action. Checks the response - * state after the action has been processed by Wicket for the presence of a - * redirect URL, and if present, 'portletifies' the URL. If the URL is a - * redirect to within the scope of this portlet, leaves it to be handled in - * a subsequent render call, or if not, sends the redirect to the client. - * The recorded url is then used in by wicket in the subsequnt 'VIEW' - * requests by the portal, to render the correct Page. - * - * @see IRequestCycleSettings#REDIRECT_TO_RENDER - * @param wicketURL - * @param request - * @param response - * @param responseState - * @throws PortletException - * @throws IOException - */ - protected void processActionResponseState(String wicketURL, final PortletRequest request, final ActionResponse response, final ResponseState responseState) throws PortletException, IOException { - // write out Cookies to ActionResponse - responseState.flushAndClose(); - String redirectLocationUrl = responseState.getRedirectLocation(); - if (LOG.isDebugEnabled()) - LOG.debug("redirectURL after include:" + redirectLocationUrl); - if (redirectLocationUrl != null && !redirectLocationUrl.isEmpty()) { - redirectLocationUrl = fixWicketUrl(wicketURL, redirectLocationUrl); - if (redirectLocationUrl.startsWith(wicketFilterPath)) { - final String portletMode = request.getPortletMode().toString(); - final String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + portletMode; - // put the redirect location into the "_wuview" action scoped request attribute - request.setAttribute(redirectUrlKey, redirectLocationUrl); - } - else - response.sendRedirect(redirectLocationUrl); - } - } - - /** - * Loops until wicket processing does not result in a redirect (redirects - * have to be caught, and fed back into Wicket as we only want the portlet - * redirected, not the entire page of course). - * - * @param request - * @param response - * @param requestType - * @param wicketURL - * @param responseState - * @throws PortletException - * @throws IOException - */ - private void processMimeResponseRequest(String wicketURL, final PortletRequest request, final MimeResponse response, final ResponseState responseState) throws PortletException, IOException { - PortletRequestDispatcher rd = null; - String previousURL = null; - // FIXME portal comment: explain while loop - // keep looping until wicket processing does not result in a redirect - // (redirects have to - // be caught, and fed back into Wicket as we only want the portlet - // redirected, not the - // entire page of course. - while (true) { - rd = getPortletContext().getRequestDispatcher(wicketURL); - if (rd != null) { - // Need to use RequestDispatcher.include here otherwise - // internally rewinding on a - // redirect - // won't be allowed (calling forward will close the response) - rd.include(request, response); - - // process _other_ response states - check for redirects as a - // result of wicket - // processing the request - - String redirectLocation = responseState.getRedirectLocation(); - String ajaxRedirectLocation = responseState.getAjaxRedirectLocation(); - if (ajaxRedirectLocation != null) { - // Ajax redirect - ajaxRedirectLocation = fixWicketUrl(wicketURL, ajaxRedirectLocation); - responseState.clear(); - responseState.setDateHeader("Date", System.currentTimeMillis()); - responseState.setDateHeader("Expires", 0); - responseState.setHeader("Pragma", "no-cache"); - responseState.setHeader("Cache-Control", "no-cache, no-store"); - //client side javascript needs the Ajax-Location header see wicket-ajax-jquery.js line 771 - responseState.setHeader("Ajax-Location", ajaxRedirectLocation);// - responseState.setContentType("text/xml;charset=UTF-8"); - responseState.getWriter().write( - ""); - responseState.flushAndClose(); - } - else if (redirectLocation != null) { - // TODO: check if its redirect to wicket page (find _wu or - // _wuPortletMode or resourceId parameter) - - redirectLocation = fixWicketUrl(wicketURL, redirectLocation); - - final boolean validWicketUrl = redirectLocation.startsWith(wicketFilterPath); - if (validWicketUrl) { - if (previousURL == null || previousURL != redirectLocation) { - previousURL = wicketURL; - wicketURL = redirectLocation; - ((RenderResponse) response).reset(); - responseState.clear(); - continue; - } - else { - // internal Wicket redirection loop: unsure yet what - // to send out from - // here - // TODO: determine what kind of error (message or - // page) should be - // written out - // for now: no output available/written :( - responseState.clear(); - break; - } - } - else { - responseState.clear(); - if (responseState.isResourceResponse()) { - // Formally, the Portlet 2.0 Spec doesn't support - // directly redirecting - // from serveResource. However, it is possible to - // write response headers - // to the ResourceResponse (using setProperty), - // which means the - // technical implementation of a response.redirect - // call might be - // "simulated" by writing out: - - // a) setting response.setStatus(SC_FOUND) - // b) setting header "Location" to the - // redirectLocation - - // Caveat 1: - // ResourceResponse.setStatus isn't supported - // either, but this can be - // done by setting the header property - // ResourceResponse.HTTP_STATUS_CODE - - // Caveat 2: Actual handling of Response headers as - // set through - // PortletResponse.setProperty is completely - // optional by the Portlet - // Spec so it really depends on the portlet - // container implementation - // (and environment, e.g. consider using WSRP - // here...) if this will - // work. - - // On Apache Pluto/Jetspeed-2, the above descibed - // handling *will* be - // implemented as expected! - - // HttpServletResponse.SC_FOUND == 302, defined by - // Servlet API >= 2.4 - response.setProperty(ResourceResponse.HTTP_STATUS_CODE, Integer.toString(302)); - response.setProperty("Location", redirectLocation); - } - else { - response.reset(); - response.setProperty("expiration-cache", "0"); - - PrintWriter writer = response.getWriter(); - writer.append(""); - writer.append(""); - writer.append(""); - writer.close(); - break; - } - } - } - else { - if (LOG.isDebugEnabled()) { - LOG.debug("ajax redirect url after inclusion:" + redirectLocation); - } - // write response state out to the PortletResponse - responseState.flushAndClose(); - } - } - break; - } - } - - /** - * Consumes and processes all portlet requests. All the doX methods delegate - * to this method, including processAction and serveResource. - * - * @param request - * @param response - * @param requestType - * @param pageType - * @throws PortletException - * @throws IOException - */ - protected void processRequest(final PortletRequest request, final PortletResponse response, final PageType pageType) throws PortletException, IOException { - String wicketURL = null; - - // get the actual wicketURL for this request, to be passed onto Wicket - // core for processing - wicketURL = getWicketURL(request, pageType, getDefaultPage(pageType)); - - if (LOG.isDebugEnabled()) - LOG.debug("Portlet \"" + request.getAttribute(PortletRequest.LIFECYCLE_PHASE) + "\" for wicket url:" + wicketURL); - - // store the response state and request type in the request object, so - // they can be looked up - // from a different context - final ResponseState responseState = new ResponseState(request, response, responseBufferFolder); - request.setAttribute(RESPONSE_STATE_ATTR, responseState); - - // need to record the effective wicket url of the rendered result, so - // that the subsequent - // portlet 'view' requests can delegate to wicket to render the correct - // location/wicket url. - if (responseState.isActionResponse()) { - // create the request dispatcher, to delegate the request to the - // wicket filter - final PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(wicketURL); - - if (rd != null) { - // delegate to wicket filter - this is where the magic happens - rd.include(request, response); - // String newWicketURL = getWicketURL(request, pageType, - // getDefaultPage(pageType)); - LOG.debug("wicket filter inclusion complete"); - processActionResponseState(wicketURL, request, (ActionResponse) response, responseState); - } - else { - // FIXME - throw exception? - // no-op for now - } - } - else if (responseState.isMimeResponse()) - processMimeResponseRequest(wicketURL, request, (MimeResponse) response, responseState); - else - LOG.warn("Unsupported Portlet lifecycle: {}", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); - if (LOG.isDebugEnabled()) { - wicketURL = getWicketURL(request, pageType, getDefaultPage(pageType)); - LOG.debug("end of request, wicket url: " + wicketURL); - } - } - - /** - * Delegates to - * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. - * - * @see #processRequest(PortletRequest, PortletResponse, String, String) - */ - @Override - public void serveResource(final ResourceRequest request, final ResourceResponse response) throws PortletException, IOException { - String resourceId = request.getResourceID(); - if (resourceId != null) { - if (PROTECTED_RESOURCES.matcher(resourceId).matches()) { - response.setProperty(ResourceResponse.HTTP_STATUS_CODE, "404"); - } - processRequest(request, response, PageType.VIEW); - } - } - - /** - * FIXME javadoc - * - *

- * Corrects the incoming URL if the old home page style, or if it's missing - * the filter path prefix. - * - * @param url - * the URL to fix - * @return the corrected URL - */ - protected String fixWicketUrl(final String url) { - if (url == null) - return wicketFilterPath; - - if (!url.startsWith(wicketFilterPath)) { - if (url.startsWith("..?")) { - return wicketFilterPath + url.substring(2); - } - if ((url + "/").equals(wicketFilterPath)) { - // hack around "old" style wicket home url's without trailing - // '/' which would lead - // to a redirect to the real home path anyway - return wicketFilterPath; - } - } - return url; - } - - /** - * FIXME javadoc - * - *

- * Corrects the incoming URL if the old home page style, or if it's missing - * the filter path prefix. - * - * @param requestUrl - * the original request URL - * @param url - * the URL to fix - * @return the corrected URL - */ - protected String fixWicketUrl(final String requestUrl, final String url) { - if ((url != null) && (requestUrl != null) && (!ABSOLUTE_URI_PATTERN.matcher(url).matches())) { - try { - if (!requestUrl.startsWith("http")) { - return new URL(new URL("http:" + requestUrl), url).toString().substring(5); - } - else { - return new URL(new URL(requestUrl), url).getPath(); - } - } - catch (Exception e) { - } - } - return fixWicketUrl(url); - } - - /** - * FIXME javadoc - * - *

- * Registers the default pages and their URLs for the different - * {@link PortletMode}s. Also corrects and slightly incorrect URLs (see - * {@link #fixWicketUrl(String)}). - * - *

- * If no specific page was specified for a given portlet mode (VIEW, EDIT - * etc) then the page for that mode is set to be the same page as that of - * the VIEW mode. - * - * @see PortletMode - * @see #fixWicketUrl(String) - * @param defaultPages - */ - protected void validateDefaultPages(final Map defaultPages) { - final String viewPage = fixWicketUrl(defaultPages.get(PageType.VIEW)); - defaultPages.put(PageType.VIEW, viewPage.startsWith(wicketFilterPath) ? viewPage : wicketFilterPath); - - String defaultPage = defaultPages.get(PageType.ACTION); - if (defaultPage == null) - defaultPages.put(PageType.ACTION, viewPage); - else { - defaultPage = fixWicketUrl(defaultPage); - defaultPages.put(PageType.ACTION, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); - } - - defaultPage = defaultPages.get(PageType.CUSTOM); - if (defaultPage == null) - defaultPages.put(PageType.CUSTOM, viewPage); - else { - defaultPage = fixWicketUrl(defaultPage); - defaultPages.put(PageType.CUSTOM, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); - } - - defaultPage = defaultPages.get(PageType.HELP); - if (defaultPage == null) - defaultPages.put(PageType.HELP, viewPage); - else { - defaultPage = fixWicketUrl(defaultPage); - defaultPages.put(PageType.HELP, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); - } - - defaultPage = defaultPages.get(PageType.EDIT); - if (defaultPage == null) - defaultPages.put(PageType.EDIT, viewPage); - else { - defaultPage = fixWicketUrl(defaultPage); - defaultPages.put(PageType.EDIT, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); - } - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.portlet; + +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Pattern; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.MimeResponse; +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequest; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletResponse; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.servlet.RequestDispatcher; + +import org.apache.wicket.protocol.http.WicketFilter; +import org.apache.wicket.util.file.File; +import org.apache.wicket.util.string.Strings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Adapter between the Portlet world requests and the internal Wicket engine. + * I.e. simulates the web/servlet environment for Wicket, while it's actually + * running as a Portlet. + * + *

+ * It receives a portlet request and dispatches to a a Wicket filter; wrapping + * the servlet context, request and response objects; intercepts response + * writing (especially urls and redirects) and rewrites and adapts the output to + * accommodate the portlet requirements. + * + *

+ * The WicketPortlet is configured (using an initParameter) against a specific + * filter path, e.g. Wicket WebApplication. The WicketPortlet maintains a + * parameter for the current Wicket page URL being requested as a URL parameter, + * based against the filter path (e.g. fully qualified to the context path). + * When a request (action, render or direct resource/ajax call) is received by + * the WicketPortlet, it dispatches it to Wicket core as a filter request using + * the provided Wicket page URL parameter. + * + * @see WicketPortlet#WICKET_URL_PORTLET_PARAMETER + * @see WicketFilter + * + * @author Ate Douma + * @author Sebastian Thomschke + * @author Peter Pastrnak + * @author Konstantinos Karavitis + */ +public class WicketPortlet extends GenericPortlet { + private static final Pattern PROTECTED_RESOURCES = Pattern.compile("\\A\\s*[/\\\\]*\\s*(WEB|META)[-]INF(.*)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE); + + private static final Pattern ABSOLUTE_URI_PATTERN = Pattern.compile("([a-z][a-z0-9]*://|/).*"); + + public static enum PageType { + ACTION("actionPage"), // + CUSTOM("customPage"), // + EDIT("editPage"), // + HELP("helpPage"), // + VIEW("viewPage"); + + public static PageType getByInitParameterName(final String initParameterName) { + for (final PageType p : PageType.values()) + if (p.initParameterName.equals(initParameterName)) + return p; + return null; + } + + public final String initParameterName; + + PageType(final String initParameterName) { + this.initParameterName = initParameterName; + } + } + + private static final Logger LOG = LoggerFactory.getLogger(WicketPortlet.class); + + /** + * FIXME javadoc + * + *

+ * The prefix for the parameter name for storing Wicket URLs. + * + *

+ * The actual Wicket URLs generated by Wicket are passed around in portal + * URLs, encoded by the portal (as a URL parameter of this name). The Wicket + * URL is later decoded on subsequent requests, from the portal URL, so that + * we know where to route the request, once it's passed out of the 'portal' + * realm and into the 'Wicket' realm. + * + *

+ * This is also used in generating links by {@link PortletRequestContext} in + * generating links, as the links have to be portal encoded links, but must + * also still contain the original wicket url for use by Wicket (e.g. + * {@link PortletRequestContext#encodeActionURL}). + * + *

+ * The default/buildin name of the parameter which stores the name of the + * wicket url is stored under {@link #WICKET_URL_PORTLET_PARAMETER}. It will + * be stored suffixed with the current portlet mode (e.g. view), so that + * render requests know what mode to render. + * + * @see PortletRequestContext + */ + public static final String WICKET_URL_PORTLET_PARAMETER = "_wu"; + + /** + * FIXME javadoc + */ + public static final String WICKET_FILTER_PATH_PARAM = "wicketFilterPath"; + /** + * FIXME javadoc + */ + public static final String RESPONSE_BUFFER_FOLDER_PARAM = "responseBufferFolder"; + /** + * FIXME javadoc + */ + public static final String CONFIG_PARAM_PREFIX = WicketPortlet.class.getName() + "."; + /** + * Marker used as key for the ResponseState object stored as a request + * attribute. + */ + public static final String RESPONSE_STATE_ATTR = ResponseState.class.getName(); + /** FIXME javadoc */ + public static final String WICKET_PORTLET_PROPERTIES = WicketPortlet.class.getName().replace('.', '/') + ".properties"; + + /** FIXME javadoc */ + private String wicketFilterPath; + + /** FIXME javadoc */ + private File responseBufferFolder; + + /** + * A collection of the default URL's for the different view modes of the + * portlet - e.g. VIEW, EDIT, HELP etc... + */ + private final HashMap defaultPages = new HashMap(); + + protected String buildWicketFilterPath(String filterPath) { + if (filterPath == null || filterPath.length() == 0) + return "/"; + + if (!filterPath.startsWith("/")) + filterPath = "/" + filterPath; + if (filterPath.endsWith("*")) + filterPath = filterPath.substring(0, filterPath.length() - 1); + if (!filterPath.endsWith("/")) + filterPath += "/"; + + return filterPath; + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + protected void doCustom(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { + processRequest(request, response, PageType.CUSTOM); + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + @Override + protected void doEdit(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { + processRequest(request, response, PageType.EDIT); + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + @Override + protected void doHelp(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { + processRequest(request, response, PageType.HELP); + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + @Override + protected void doView(final RenderRequest request, final RenderResponse response) throws PortletException, IOException { + processRequest(request, response, PageType.VIEW); + } + + /** + * @param pageType + * the mode of the portlet page, e.g. VIEW, EDIT etc... + * @return the default page name for the given pate type. + */ + protected String getDefaultPage(final PageType pageType) { + return defaultPages.get(pageType); + } + + /** + * Loads the Wicket Portlet properties file off the class path. + * + * FIXME javadoc - check properties + * + * @param properties + * appends the portlet properties to + * @return Wicket portlet properties. Returns an empty or unchanged + * properties object if Wicket Portlet properties could not be found + * @throws PortletException + * if loading the properties fails + */ + protected Properties getWicketPortletProperties(Properties properties) throws PortletException { + if (properties == null) + properties = new Properties(); + final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(WICKET_PORTLET_PROPERTIES); + if (is != null) + try { + properties.load(is); + } + catch (final IOException e) { + throw new PortletException("Failed to load WicketPortlet.properties from classpath", e); + } + return properties; + } + + /** + * Retrieves the Wicket URL from the request object as a request parameter, + * or if none exists returns the default URL. The name of the request + * parameter is stored as a request attribute. + * + *

+ * This url is then used to pass on to the matching {@link WicketFilter} to + * process, by way of {@link RequestDispatcher} via the filters context + * path. + * + *

+ * A "parameter" is a form field name/value pair passed from the HTML side + * of the world. Its value is a String. + * + *

+ * An "attribute" is a Java object name/value pair passed only through the + * internal JavaServer processes. (I.e. it can come from a JSP or servlet + * but not an HTML page.) Its value is an Object. + * + * @see PortletRequestContext#getLastEncodedPath() + * @param request + * @param pageType + * @param defaultPage + * url of the default page + * @return the Wicket URL from within the specified request + */ + protected String getWicketURL(final PortletRequest request, final PageType pageType, final String defaultPage) { + String wicketURL = null; + if (request instanceof ActionRequest) + // try to lookup the passed in wicket url parameter + wicketURL = request.getParameter(WICKET_URL_PORTLET_PARAMETER); + else if (request instanceof ResourceRequest) + wicketURL = ((ResourceRequest) request).getResourceID(); + else { + // try to lookup the passed in wicket url parameter, suffixed with + // the portlet mode + String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + request.getPortletMode().toString(); + String redirectUrl = request.getParameter(redirectUrlKey); + // if the wicket url is not in request parameters try to lookup into the action scoped + // attributes. + wicketURL = redirectUrl == null ? (String)request.getAttribute(redirectUrlKey) : redirectUrl; + } + + // if the wicketURL could not be retrieved, return the url for the + // default page + if (wicketURL == null) + wicketURL = defaultPage; + return wicketURL; + } + + /** + * {@inheritDoc} + */ + @Override + public void init(final PortletConfig config) throws PortletException { + // enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) + config.getContainerRuntimeOptions().put("javax.portlet.actionScopedRequestAttributes", + new String[] { "true", "numberOfCachedScopes", "10" }); + super.init(config); + + wicketFilterPath = buildWicketFilterPath(config.getInitParameter(WICKET_FILTER_PATH_PARAM)); + String responseBufferFolderPath = config.getInitParameter(RESPONSE_BUFFER_FOLDER_PARAM); + if ((responseBufferFolderPath != null) && (!Strings.isEmpty(responseBufferFolderPath))) { + responseBufferFolder = new File(responseBufferFolderPath); + } + + for (final PageType p : PageType.values()) { + defaultPages.put(p, config.getInitParameter(p.initParameterName)); + } + + validateDefaultPages(defaultPages); + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + *

+ * Stores the {@link ActionResponse} so that + * {@link PortletEventService#broadcast} can send events using + * {@link ActionResponse#setEvent} + * + * @see PortletEventService#broadcastToPortletListeners + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + @Override + public void processAction(final ActionRequest request, final ActionResponse response) throws PortletException, IOException { + processRequest(request, response, PageType.ACTION); + } + + /** + * Handles redirects set from processing the action. Checks the response + * state after the action has been processed by Wicket for the presence of a + * redirect URL, and if present, 'portletifies' the URL. If the URL is a + * redirect to within the scope of this portlet, leaves it to be handled in + * a subsequent render call, or if not, sends the redirect to the client. + * The recorded url is then used in by wicket in the subsequnt 'VIEW' + * requests by the portal, to render the correct Page. + * + * @see IRequestCycleSettings#REDIRECT_TO_RENDER + * @param wicketURL + * @param request + * @param response + * @param responseState + * @throws PortletException + * @throws IOException + */ + protected void processActionResponseState(String wicketURL, final PortletRequest request, final ActionResponse response, final ResponseState responseState) throws PortletException, IOException { + // write out Cookies to ActionResponse + responseState.flushAndClose(); + String redirectLocationUrl = responseState.getRedirectLocation(); + if (LOG.isDebugEnabled()) + LOG.debug("redirectURL after include:" + redirectLocationUrl); + if (redirectLocationUrl != null && !redirectLocationUrl.isEmpty()) { + redirectLocationUrl = fixWicketUrl(wicketURL, redirectLocationUrl, request.getScheme()); + if (redirectLocationUrl.startsWith(wicketFilterPath)) { + final String portletMode = request.getPortletMode().toString(); + final String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + portletMode; + // put the redirect location into the "_wuview" action scoped request attribute + request.setAttribute(redirectUrlKey, redirectLocationUrl); + } + else + response.sendRedirect(redirectLocationUrl); + } + } + + /** + * Loops until wicket processing does not result in a redirect (redirects + * have to be caught, and fed back into Wicket as we only want the portlet + * redirected, not the entire page of course). + * + * @param request + * @param response + * @param requestType + * @param wicketURL + * @param responseState + * @throws PortletException + * @throws IOException + */ + private void processMimeResponseRequest(String wicketURL, final PortletRequest request, final MimeResponse response, final ResponseState responseState) throws PortletException, IOException { + PortletRequestDispatcher rd = null; + String previousURL = null; + // FIXME portal comment: explain while loop + // keep looping until wicket processing does not result in a redirect + // (redirects have to + // be caught, and fed back into Wicket as we only want the portlet + // redirected, not the + // entire page of course. + while (true) { + rd = getPortletContext().getRequestDispatcher(wicketURL); + if (rd != null) { + // Need to use RequestDispatcher.include here otherwise + // internally rewinding on a + // redirect + // won't be allowed (calling forward will close the response) + rd.include(request, response); + + // process _other_ response states - check for redirects as a + // result of wicket + // processing the request + + String redirectLocation = responseState.getRedirectLocation(); + String ajaxRedirectLocation = responseState.getAjaxRedirectLocation(); + if (ajaxRedirectLocation != null) { + // Ajax redirect + ajaxRedirectLocation = fixWicketUrl(wicketURL, ajaxRedirectLocation, request.getScheme()); + responseState.clear(); + responseState.setDateHeader("Date", System.currentTimeMillis()); + responseState.setDateHeader("Expires", 0); + responseState.setHeader("Pragma", "no-cache"); + responseState.setHeader("Cache-Control", "no-cache, no-store"); + //client side javascript needs the Ajax-Location header see wicket-ajax-jquery.js line 771 + responseState.setHeader("Ajax-Location", ajaxRedirectLocation);// + responseState.setContentType("text/xml;charset=UTF-8"); + responseState.getWriter().write( + ""); + responseState.flushAndClose(); + } + else if (redirectLocation != null) { + // TODO: check if its redirect to wicket page (find _wu or + // _wuPortletMode or resourceId parameter) + + redirectLocation = fixWicketUrl(wicketURL, redirectLocation, request.getScheme()); + + final boolean validWicketUrl = redirectLocation.startsWith(wicketFilterPath); + if (validWicketUrl) { + if (previousURL == null || previousURL != redirectLocation) { + previousURL = wicketURL; + wicketURL = redirectLocation; + ((RenderResponse) response).reset(); + responseState.clear(); + continue; + } + else { + // internal Wicket redirection loop: unsure yet what + // to send out from + // here + // TODO: determine what kind of error (message or + // page) should be + // written out + // for now: no output available/written :( + responseState.clear(); + break; + } + } + else { + responseState.clear(); + if (responseState.isResourceResponse()) { + // Formally, the Portlet 2.0 Spec doesn't support + // directly redirecting + // from serveResource. However, it is possible to + // write response headers + // to the ResourceResponse (using setProperty), + // which means the + // technical implementation of a response.redirect + // call might be + // "simulated" by writing out: + + // a) setting response.setStatus(SC_FOUND) + // b) setting header "Location" to the + // redirectLocation + + // Caveat 1: + // ResourceResponse.setStatus isn't supported + // either, but this can be + // done by setting the header property + // ResourceResponse.HTTP_STATUS_CODE + + // Caveat 2: Actual handling of Response headers as + // set through + // PortletResponse.setProperty is completely + // optional by the Portlet + // Spec so it really depends on the portlet + // container implementation + // (and environment, e.g. consider using WSRP + // here...) if this will + // work. + + // On Apache Pluto/Jetspeed-2, the above descibed + // handling *will* be + // implemented as expected! + + // HttpServletResponse.SC_FOUND == 302, defined by + // Servlet API >= 2.4 + response.setProperty(ResourceResponse.HTTP_STATUS_CODE, Integer.toString(302)); + response.setProperty("Location", redirectLocation); + } + else { + response.reset(); + response.setProperty("expiration-cache", "0"); + + PrintWriter writer = response.getWriter(); + writer.append(""); + writer.append(""); + writer.append(""); + writer.close(); + break; + } + } + } + else { + if (LOG.isDebugEnabled()) { + LOG.debug("ajax redirect url after inclusion:" + redirectLocation); + } + // write response state out to the PortletResponse + responseState.flushAndClose(); + } + } + break; + } + } + + /** + * Consumes and processes all portlet requests. All the doX methods delegate + * to this method, including processAction and serveResource. + * + * @param request + * @param response + * @param requestType + * @param pageType + * @throws PortletException + * @throws IOException + */ + protected void processRequest(final PortletRequest request, final PortletResponse response, final PageType pageType) throws PortletException, IOException { + String wicketURL = null; + + // get the actual wicketURL for this request, to be passed onto Wicket + // core for processing + wicketURL = getWicketURL(request, pageType, getDefaultPage(pageType)); + + if (LOG.isDebugEnabled()) + LOG.debug("Portlet \"" + request.getAttribute(PortletRequest.LIFECYCLE_PHASE) + "\" for wicket url:" + wicketURL); + + // store the response state and request type in the request object, so + // they can be looked up + // from a different context + final ResponseState responseState = new ResponseState(request, response, responseBufferFolder); + request.setAttribute(RESPONSE_STATE_ATTR, responseState); + + // need to record the effective wicket url of the rendered result, so + // that the subsequent + // portlet 'view' requests can delegate to wicket to render the correct + // location/wicket url. + if (responseState.isActionResponse()) { + // create the request dispatcher, to delegate the request to the + // wicket filter + final PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(wicketURL); + + if (rd != null) { + // delegate to wicket filter - this is where the magic happens + rd.include(request, response); + // String newWicketURL = getWicketURL(request, pageType, + // getDefaultPage(pageType)); + LOG.debug("wicket filter inclusion complete"); + processActionResponseState(wicketURL, request, (ActionResponse) response, responseState); + } + else { + // FIXME - throw exception? + // no-op for now + } + } + else if (responseState.isMimeResponse()) + processMimeResponseRequest(wicketURL, request, (MimeResponse) response, responseState); + else + LOG.warn("Unsupported Portlet lifecycle: {}", request.getAttribute(PortletRequest.LIFECYCLE_PHASE)); + if (LOG.isDebugEnabled()) { + wicketURL = getWicketURL(request, pageType, getDefaultPage(pageType)); + LOG.debug("end of request, wicket url: " + wicketURL); + } + } + + /** + * Delegates to + * {@link #processRequest(PortletRequest, PortletResponse, String, String)}. + * + * @see #processRequest(PortletRequest, PortletResponse, String, String) + */ + @Override + public void serveResource(final ResourceRequest request, final ResourceResponse response) throws PortletException, IOException { + String resourceId = request.getResourceID(); + if (resourceId != null) { + if (PROTECTED_RESOURCES.matcher(resourceId).matches()) { + response.setProperty(ResourceResponse.HTTP_STATUS_CODE, "404"); + } + processRequest(request, response, PageType.VIEW); + } + } + + /** + * FIXME javadoc + * + *

+ * Corrects the incoming URL if the old home page style, or if it's missing + * the filter path prefix. + * + * @param url + * the URL to fix + * @return the corrected URL + */ + protected String fixWicketUrl(final String url) { + if (url == null) + return wicketFilterPath; + + if (!url.startsWith(wicketFilterPath)) { + if (url.startsWith("..?")) { + return wicketFilterPath + url.substring(2); + } + if ((url + "/").equals(wicketFilterPath)) { + // hack around "old" style wicket home url's without trailing + // '/' which would lead + // to a redirect to the real home path anyway + return wicketFilterPath; + } + } + return url; + } + + /** + * FIXME javadoc + * + *

+ * Corrects the incoming URL if the old home page style, or if it's missing + * the filter path prefix. + * + * @param requestUrl + * the original request URL + * @param url + * the URL to fix + * @return the corrected URL + */ + protected String fixWicketUrl(final String requestUrl, final String url, final String scheme) { + if ((url != null) && (requestUrl != null) && (!ABSOLUTE_URI_PATTERN.matcher(url).matches())) { + try { + if (!requestUrl.startsWith("http")) { + return new URL(new URL(scheme + ":" + requestUrl), url).toString().substring(scheme.length() + 1); + } + else { + return new URL(new URL(requestUrl), url).getPath(); + } + } + catch (Exception e) { + } + } + return fixWicketUrl(url); + } + + /** + * FIXME javadoc + * + *

+ * Registers the default pages and their URLs for the different + * {@link PortletMode}s. Also corrects and slightly incorrect URLs (see + * {@link #fixWicketUrl(String)}). + * + *

+ * If no specific page was specified for a given portlet mode (VIEW, EDIT + * etc) then the page for that mode is set to be the same page as that of + * the VIEW mode. + * + * @see PortletMode + * @see #fixWicketUrl(String) + * @param defaultPages + */ + protected void validateDefaultPages(final Map defaultPages) { + final String viewPage = fixWicketUrl(defaultPages.get(PageType.VIEW)); + defaultPages.put(PageType.VIEW, viewPage.startsWith(wicketFilterPath) ? viewPage : wicketFilterPath); + + String defaultPage = defaultPages.get(PageType.ACTION); + if (defaultPage == null) + defaultPages.put(PageType.ACTION, viewPage); + else { + defaultPage = fixWicketUrl(defaultPage); + defaultPages.put(PageType.ACTION, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); + } + + defaultPage = defaultPages.get(PageType.CUSTOM); + if (defaultPage == null) + defaultPages.put(PageType.CUSTOM, viewPage); + else { + defaultPage = fixWicketUrl(defaultPage); + defaultPages.put(PageType.CUSTOM, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); + } + + defaultPage = defaultPages.get(PageType.HELP); + if (defaultPage == null) + defaultPages.put(PageType.HELP, viewPage); + else { + defaultPage = fixWicketUrl(defaultPage); + defaultPages.put(PageType.HELP, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); + } + + defaultPage = defaultPages.get(PageType.EDIT); + if (defaultPage == null) + defaultPages.put(PageType.EDIT, viewPage); + else { + defaultPage = fixWicketUrl(defaultPage); + defaultPages.put(PageType.EDIT, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); + } + } +} From 0b1426f1855d51f868e3f2844d28220f9f167804 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Wed, 10 Aug 2016 00:31:02 +0300 Subject: [PATCH 010/139] make the portlet bridge schema(http/https) aware #531 --- .../org/apache/wicket/portlet/PortletFilter.java | 14 +------------- .../org/apache/wicket/portlet/WicketPortlet.java | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java index c482e85e2a..324df6a2b9 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletFilter.java @@ -67,12 +67,10 @@ public class PortletFilter extends WicketFilter { public void init(boolean isServlet, FilterConfig filterConfig) throws ServletException { super.init(isServlet, filterConfig); this.filterConfig = filterConfig; - getApplication().getRequestCycleSettings().setRenderStrategy(RenderStrategy.REDIRECT_TO_RENDER); getApplication().getRequestCycleSettings().addResponseFilter(new PortletInvalidMarkupFilter()); //fix for https://github.com/wicketstuff/core/issues/487 getApplication().getMarkupSettings().setMarkupIdGenerator(new PortletMarkupIdGenerator()); - //make the wicket bridge schema (HTTPS/HTTP) aware getApplication().setRootRequestMapper(new HttpsMapper(new PortletRequestMapper(getApplication()), new HttpsConfig()){ @Override @@ -81,7 +79,6 @@ protected Scheme getDesiredSchemeFor(IRequestHandler handler) { return super.getSchemeOf(request); } }); - //Application must use the portlet specific page renderer provider. getApplication().setPageRendererProvider(new IPageRendererProvider() { @Override @@ -173,13 +170,4 @@ protected boolean processRequestCycle(RequestCycle requestCycle, WebResponse web } return res; } - - private void test() { - try { - super.init(null); - } catch (ServletException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } -} +} \ No newline at end of file diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java index dcdecfcc93..6c987560d9 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java @@ -716,4 +716,4 @@ protected void validateDefaultPages(final Map defaultPages) { defaultPages.put(PageType.EDIT, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); } } -} +} \ No newline at end of file From 99b1b985fac2f7bf0fc86ef60a437a2afd92ae8d Mon Sep 17 00:00:00 2001 From: Sven Meier Date: Thu, 18 Aug 2016 22:54:46 +0200 Subject: [PATCH 011/139] issue 534: keep caching scoped to application --- .../wicketstuff/lazymodel/Initializer.java | 42 ++++++++ .../reflect/CachingMethodResolver.java | 96 ++++++++++++++----- .../services/org.apache.wicket.IInitializer | 1 + 3 files changed, 114 insertions(+), 25 deletions(-) create mode 100644 wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java create mode 100644 wicketstuff-lazymodel/src/main/resources/META-INF/services/org.apache.wicket.IInitializer diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java new file mode 100644 index 0000000000..d26af15e43 --- /dev/null +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wicketstuff.lazymodel; + +import org.apache.wicket.Application; +import org.apache.wicket.IInitializer; +import org.wicketstuff.lazymodel.reflect.CachingMethodResolver; +import org.wicketstuff.lazymodel.reflect.IMethodResolver; + +/** + * Initializer. + * + * @author svenmeier + */ +public class Initializer implements IInitializer { + + @Override + public void init(Application application) { + } + + @Override + public void destroy(Application application) { + IMethodResolver resolver = LazyModel.methodResolver; + if (resolver instanceof CachingMethodResolver) { + ((CachingMethodResolver) resolver).destroy(application); + } + } +} diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingMethodResolver.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingMethodResolver.java index f7b9f36ccb..ff9a0de693 100644 --- a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingMethodResolver.java +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingMethodResolver.java @@ -21,6 +21,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.wicket.Application; +import org.apache.wicket.util.lang.Generics; + /** * A cache of a wrapped {@link IMethodResolver}. * @@ -28,50 +31,93 @@ */ public class CachingMethodResolver implements IMethodResolver { - private final IMethodResolver resolver; - - private final Map methods = new ConcurrentHashMap(); - - private final Map ids = new ConcurrentHashMap(); + private final ConcurrentHashMap scopes = Generics.newConcurrentHashMap(2); - private final Map setters = new ConcurrentHashMap(); + private final IMethodResolver resolver; public CachingMethodResolver(IMethodResolver resolver) { this.resolver = resolver; } - @Override - public Method getMethod(Class owner, Serializable id) { - String key = owner.getName() + ":" + id; + private IMethodResolver getResolver() { + Object key; + if (Application.exists()) { + key = Application.get(); + } else { + key = CachingMethodResolver.class; + } - Method method = methods.get(key); - if (method == null) { - method = resolver.getMethod(owner, id); - methods.put(key, method); + IMethodResolver result = scopes.get(key); + if (result == null) { + IMethodResolver tmpResult = scopes.putIfAbsent(key, result = new ApplicationScope()); + if (tmpResult != null) { + result = tmpResult; + } } - return method; + return result; + } + + @Override + public Method getMethod(Class owner, Serializable id) { + return getResolver().getMethod(owner, id); } @Override public Serializable getId(Method method) { - Serializable id = ids.get(method); - if (id == null) { - id = resolver.getId(method); - ids.put(method, id); - } - return id; + return getResolver().getId(method); } @Override public Method getSetter(Method getter) { - Method setter = setters.get(getter); + return getResolver().getSetter(getter); + } - if (setter == null) { - setter = resolver.getSetter(getter); - setters.put(getter, setter); + public void destroy(Application application) { + scopes.remove(application); + } + + private class ApplicationScope implements IMethodResolver { + + private final Map methods = new ConcurrentHashMap(); + + private final Map ids = new ConcurrentHashMap(); + + private final Map setters = new ConcurrentHashMap(); + + @Override + public Method getMethod(Class owner, Serializable id) { + String key = owner.getName() + ":" + id; + + Method method = methods.get(key); + if (method == null) { + method = resolver.getMethod(owner, id); + methods.put(key, method); + } + + return method; + } + + @Override + public Serializable getId(Method method) { + Serializable id = ids.get(method); + if (id == null) { + id = resolver.getId(method); + ids.put(method, id); + } + return id; } - return setter; + @Override + public Method getSetter(Method getter) { + Method setter = setters.get(getter); + + if (setter == null) { + setter = resolver.getSetter(getter); + setters.put(getter, setter); + } + + return setter; + } } } \ No newline at end of file diff --git a/wicketstuff-lazymodel/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicketstuff-lazymodel/src/main/resources/META-INF/services/org.apache.wicket.IInitializer new file mode 100644 index 0000000000..cc1879e566 --- /dev/null +++ b/wicketstuff-lazymodel/src/main/resources/META-INF/services/org.apache.wicket.IInitializer @@ -0,0 +1 @@ +org.wicketstuff.lazymodel.Initializer \ No newline at end of file From bf19c78f4bc4a5e6d9313c4d56282db34aa24eb3 Mon Sep 17 00:00:00 2001 From: Sven Meier Date: Fri, 19 Aug 2016 13:32:29 +0200 Subject: [PATCH 012/139] issue 534: keep caching of proxy factory scoped to application --- .../wicketstuff/lazymodel/Initializer.java | 8 ++ .../reflect/CachingProxyFactory.java | 85 +++++++++++++++---- .../lazymodel/reflect/Evaluation.java | 2 +- .../reflect/CachingProxyFactoryTest.java | 58 +++++++++++++ 4 files changed, 134 insertions(+), 19 deletions(-) create mode 100644 wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactoryTest.java diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java index d26af15e43..f92ee13176 100644 --- a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/Initializer.java @@ -19,7 +19,10 @@ import org.apache.wicket.Application; import org.apache.wicket.IInitializer; import org.wicketstuff.lazymodel.reflect.CachingMethodResolver; +import org.wicketstuff.lazymodel.reflect.CachingProxyFactory; +import org.wicketstuff.lazymodel.reflect.Evaluation; import org.wicketstuff.lazymodel.reflect.IMethodResolver; +import org.wicketstuff.lazymodel.reflect.IProxyFactory; /** * Initializer. @@ -38,5 +41,10 @@ public void destroy(Application application) { if (resolver instanceof CachingMethodResolver) { ((CachingMethodResolver) resolver).destroy(application); } + + IProxyFactory factory = Evaluation.proxyFactory; + if (factory instanceof CachingProxyFactory) { + ((CachingProxyFactory) resolver).destroy(application); + } } } diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactory.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactory.java index 3090a76d0b..3da33e2b91 100644 --- a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactory.java +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactory.java @@ -19,11 +19,17 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.apache.wicket.Application; +import org.apache.wicket.util.lang.Generics; + /** + * A factory caching proxy classes. + * + * @see #createClass(Class) */ public class CachingProxyFactory implements IProxyFactory { - private final Map, Class> proxyClasses = new ConcurrentHashMap, Class>(); + private final ConcurrentHashMap scopes = Generics.newConcurrentHashMap(2); private final IProxyFactory factory; @@ -33,31 +39,74 @@ public CachingProxyFactory(IProxyFactory factory) { @Override public Class createClass(Class clazz) { - Class proxyClazz = proxyClasses.get(clazz); - if (proxyClazz == null) { - proxyClazz = factory.createClass(clazz); - if (proxyClazz == null) { - proxyClazz = NOT_PROXYABLE.class; - } - proxyClasses.put(clazz, proxyClazz); + return getFactory().createClass(clazz); + } + + @Override + public Object createInstance(final Class proxyClass, final Callback callback) { + return getFactory().createInstance(proxyClass, callback); + } + + @Override + public Callback getCallback(Object proxy) { + return getFactory().getCallback(proxy); + } + + private IProxyFactory getFactory() { + Object key; + if (Application.exists()) { + key = Application.get(); + } else { + key = CachingProxyFactory.class; } - if (proxyClazz == NOT_PROXYABLE.class) { - proxyClazz = null; + IProxyFactory result = scopes.get(key); + if (result == null) { + IProxyFactory tmpResult = scopes.putIfAbsent(key, result = new ApplicationScope()); + if (tmpResult != null) { + result = tmpResult; + } } - return proxyClazz; + return result; } - @Override - public Object createInstance(final Class proxyClass, - final Callback callback) { - return factory.createInstance(proxyClass, callback); + public void destroy(Application application) { + scopes.remove(application); } - @Override - public Callback getCallback(Object proxy) { - return factory.getCallback(proxy); + private class ApplicationScope implements IProxyFactory { + + private final Map, Class> proxyClasses = new ConcurrentHashMap, Class>(); + + @Override + public Class createClass(Class clazz) { + Class proxyClazz = proxyClasses.get(clazz); + if (proxyClazz == null) { + proxyClazz = factory.createClass(clazz); + if (proxyClazz == null) { + proxyClazz = NOT_PROXYABLE.class; + } + proxyClasses.put(clazz, proxyClazz); + } + + if (proxyClazz == NOT_PROXYABLE.class) { + proxyClazz = null; + } + + return proxyClazz; + } + + @Override + public Object createInstance(final Class proxyClass, + final Callback callback) { + return factory.createInstance(proxyClass, callback); + } + + @Override + public Callback getCallback(Object proxy) { + return factory.getCallback(proxy); + } } private class NOT_PROXYABLE { diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java index 880e24f01a..43e1ac6dac 100644 --- a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java @@ -51,7 +51,7 @@ public class Evaluation implements Callback { /** * The factory for proxies. */ - private static IProxyFactory proxyFactory = new CachingProxyFactory( + public static IProxyFactory proxyFactory = new CachingProxyFactory( new DefaultProxyFactory()); /** diff --git a/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactoryTest.java b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactoryTest.java new file mode 100644 index 0000000000..34bc45bf8d --- /dev/null +++ b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/reflect/CachingProxyFactoryTest.java @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wicketstuff.lazymodel.reflect; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +/** + * Test for {@link CachingProxyFactory}. + * + * @author svenmeier + */ +public class CachingProxyFactoryTest { + + @Test + public void test() throws Exception { + final int[] count = new int[1]; + + IProxyFactory factory = new CachingProxyFactory(new IProxyFactory() { + + @Override + public Callback getCallback(Object proxy) { + return null; + } + + @Override + public Object createInstance(Class proxyClass, Callback callback) { + return null; + } + + @Override + public Class createClass(Class clazz) { + count[0]++; + + return clazz; + } + }); + + factory.createClass(String.class); + factory.createClass(String.class); + assertEquals(1, count[0]); + } +} From dd96a10537f1cf270945ff31c7474464a3b207ce Mon Sep 17 00:00:00 2001 From: Logan Freer Date: Fri, 26 Aug 2016 14:48:26 -0600 Subject: [PATCH 013/139] Fixed attribute in Facebook LoginButton constructor. --- .../main/java/org/wicketstuff/facebook/plugins/LoginButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicket-facebook-parent/wicket-facebook/src/main/java/org/wicketstuff/facebook/plugins/LoginButton.java b/wicket-facebook-parent/wicket-facebook/src/main/java/org/wicketstuff/facebook/plugins/LoginButton.java index 44440f7f9c..3354d3040b 100644 --- a/wicket-facebook-parent/wicket-facebook/src/main/java/org/wicketstuff/facebook/plugins/LoginButton.java +++ b/wicket-facebook-parent/wicket-facebook/src/main/java/org/wicketstuff/facebook/plugins/LoginButton.java @@ -60,7 +60,7 @@ public LoginButton(final String id) add(new AttributeModifier("data-show-faces", new PropertyModel(this, "showFaces"))); add(new AttributeModifier("data-max-rows", new PropertyModel(this, "maxRows"))); - add(new AttributeModifier("data-perms", new PermissionsModel())); + add(new AttributeModifier("data-scope", new PermissionsModel())); } /** From a45c0c3005fe8346c9e4c3c10359daba2d47b95d Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 31 Aug 2016 12:18:13 +0200 Subject: [PATCH 014/139] Change version to 7.5.0-SNAPSHOT --- annotation/pom.xml | 2 +- .../annotationeventdispatcher/pom.xml | 2 +- annotationeventdispatcher-parent/pom.xml | 2 +- async-tasks-parent/async-tasks-demo/pom.xml | 2 +- async-tasks-parent/async-tasks-impl/pom.xml | 2 +- async-tasks-parent/pom.xml | 2 +- autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml | 2 +- autocomplete-tagit-parent/autocomplete-tagit/pom.xml | 2 +- autocomplete-tagit-parent/pom.xml | 2 +- browserid-parent/browserid-examples/pom.xml | 2 +- browserid-parent/browserid/pom.xml | 2 +- browserid-parent/pom.xml | 2 +- closure-compiler/pom.xml | 2 +- dashboard-parent/dashboard-core/pom.xml | 2 +- dashboard-parent/dashboard-examples/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-charts/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-jqplot/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-justgage/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-loremipsum/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-ofchart/pom.xml | 2 +- dashboard-parent/dashboard-widgets/pom.xml | 2 +- dashboard-parent/pom.xml | 2 +- datastores-parent/datastore-cassandra/pom.xml | 2 +- datastores-parent/datastore-common/pom.xml | 2 +- datastores-parent/datastore-hazelcast/pom.xml | 2 +- datastores-parent/datastore-ignite/pom.xml | 2 +- datastores-parent/datastore-memcached/pom.xml | 2 +- datastores-parent/datastore-redis/pom.xml | 2 +- datastores-parent/pom.xml | 2 +- datatables-parent/datatables-examples/pom.xml | 2 +- datatables-parent/datatables/pom.xml | 2 +- datatables-parent/pom.xml | 2 +- editable-grid-parent/editable-grid-examples/pom.xml | 2 +- editable-grid-parent/editable-grid/pom.xml | 2 +- editable-grid-parent/pom.xml | 2 +- flot-parent/flot-examples/pom.xml | 2 +- flot-parent/flot/pom.xml | 2 +- flot-parent/pom.xml | 2 +- gae-initializer-parent/gae-initializer-example/pom.xml | 2 +- gae-initializer-parent/gae-initializer/pom.xml | 2 +- gae-initializer-parent/pom.xml | 2 +- gmap3-parent/gmap3-examples/pom.xml | 2 +- gmap3-parent/gmap3/pom.xml | 2 +- gmap3-parent/pom.xml | 2 +- googlecharts-parent/googlecharts-examples/pom.xml | 2 +- googlecharts-parent/googlecharts/pom.xml | 2 +- googlecharts-parent/pom.xml | 2 +- htmlcompressor-parent/htmlcompressor-examples/pom.xml | 2 +- htmlcompressor-parent/htmlcompressor/pom.xml | 2 +- htmlcompressor-parent/pom.xml | 2 +- inmethod-grid-parent/inmethod-grid-examples/pom.xml | 2 +- inmethod-grid-parent/inmethod-grid/pom.xml | 2 +- inmethod-grid-parent/pom.xml | 2 +- input-events-parent/input-events-examples/pom.xml | 2 +- input-events-parent/input-events/pom.xml | 2 +- input-events-parent/pom.xml | 2 +- jamon-parent/jamon-examples/pom.xml | 2 +- jamon-parent/jamon/pom.xml | 2 +- jamon-parent/pom.xml | 2 +- jasperreports-parent/jasperreports-examples/pom.xml | 2 +- jasperreports-parent/jasperreports/pom.xml | 2 +- jasperreports-parent/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-ear/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-ejb/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-war/pom.xml | 2 +- javaee-inject-parent/javaee-inject-examples/pom.xml | 2 +- javaee-inject-parent/javaee-inject/pom.xml | 2 +- javaee-inject-parent/pom.xml | 2 +- jee-web-parent/jee-web-examples/pom.xml | 2 +- jee-web-parent/jee-web/pom.xml | 2 +- jee-web-parent/pom.xml | 2 +- jqplot-parent/jqplot-examples/pom.xml | 2 +- jqplot-parent/jqplot/pom.xml | 2 +- jqplot-parent/pom.xml | 2 +- jquery-parent/jquery-examples/pom.xml | 2 +- jquery-parent/jquery/pom.xml | 2 +- jquery-parent/pom.xml | 2 +- jwicket-parent/dropdown-menu/pom.xml | 2 +- jwicket-parent/jwicket-core/pom.xml | 2 +- jwicket-parent/jwicket-examples/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml | 2 +- jwicket-parent/jwicket-tooltip/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml | 2 +- jwicket-parent/jwicket-ui/pom.xml | 2 +- jwicket-parent/pom.xml | 2 +- lambda-parent/lambda-examples/pom.xml | 2 +- lambda-parent/lambda/pom.xml | 2 +- lambda-parent/pom.xml | 2 +- lightbox2-parent/lightbox2-examples/pom.xml | 2 +- lightbox2-parent/lightbox2/pom.xml | 2 +- lightbox2-parent/pom.xml | 2 +- mbeanview-parent/mbeanview-examples/pom.xml | 2 +- mbeanview-parent/mbeanview/pom.xml | 2 +- mbeanview-parent/pom.xml | 2 +- minis-parent/minis-examples/pom.xml | 2 +- minis-parent/minis/pom.xml | 2 +- minis-parent/pom.xml | 2 +- modalx-parent/modalx-examples/pom.xml | 2 +- modalx-parent/modalx/pom.xml | 2 +- modalx-parent/pom.xml | 2 +- nashorn-parent/nashorn-examples/pom.xml | 2 +- nashorn-parent/nashorn/pom.xml | 2 +- nashorn-parent/pom.xml | 2 +- objectautocomplete-parent/objectautocomplete-examples/pom.xml | 2 +- objectautocomplete-parent/objectautocomplete/pom.xml | 2 +- objectautocomplete-parent/pom.xml | 2 +- offline-mode-parent/offline-mode-examples/pom.xml | 2 +- offline-mode-parent/offline-mode/pom.xml | 2 +- offline-mode-parent/pom.xml | 2 +- openlayers-parent/openlayers-examples/pom.xml | 2 +- openlayers-parent/openlayers-proxy/pom.xml | 2 +- openlayers-parent/openlayers/pom.xml | 2 +- openlayers-parent/pom.xml | 2 +- openlayers3-parent/openlayers3-bootstrap/pom.xml | 2 +- openlayers3-parent/openlayers3-examples/pom.xml | 2 +- openlayers3-parent/openlayers3/pom.xml | 2 +- openlayers3-parent/pom.xml | 2 +- phonebook/pom.xml | 2 +- plugin/pom.xml | 2 +- pom.xml | 2 +- portlet-parent/pom.xml | 2 +- portlet-parent/wicketstuff-portlet-examples/pom.xml | 2 +- portlet-parent/wicketstuff-portlet/pom.xml | 2 +- progressbar-parent/pom.xml | 2 +- progressbar-parent/progressbar-example/pom.xml | 2 +- progressbar-parent/progressbar-spring/pom.xml | 2 +- progressbar-parent/progressbar/pom.xml | 2 +- push-parent/pom.xml | 2 +- push-parent/push-cometd/pom.xml | 2 +- push-parent/push-core/pom.xml | 2 +- push-parent/push-examples/pom.xml | 2 +- push-parent/push-timer/pom.xml | 2 +- scala-extensions-parent/pom.xml | 2 +- scala-extensions-parent/wicket-scala-archetype/pom.xml | 2 +- scala-extensions-parent/wicket-scala-sample/pom.xml | 2 +- scala-extensions-parent/wicket-scala/pom.xml | 2 +- select2-parent/pom.xml | 2 +- select2-parent/select2-examples/pom.xml | 2 +- select2-parent/select2/pom.xml | 2 +- serializer-common/pom.xml | 2 +- serializer-fast/pom.xml | 2 +- serializer-fast2/pom.xml | 2 +- serializer-kryo/pom.xml | 2 +- serializer-kryo2/pom.xml | 2 +- serializer-ui/pom.xml | 2 +- shiro-security/pom.xml | 2 +- shiro-security/wicket-shiro-examples/pom.xml | 2 +- shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml | 2 +- .../wicket-shiro-examples/shiro-example-realm/pom.xml | 2 +- .../shiro-example-spring-hibernate-native/pom.xml | 2 +- .../shiro-example-spring-hibernate/pom.xml | 2 +- .../wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml | 2 +- shiro-security/wicket-shiro/pom.xml | 2 +- simile-timeline-parent/pom.xml | 2 +- simile-timeline-parent/simile-timeline/pom.xml | 2 +- sitemap-xml-parent/pom.xml | 2 +- sitemap-xml-parent/sitemap-xml-examples/pom.xml | 2 +- sitemap-xml-parent/sitemap-xml/pom.xml | 2 +- stateless-parent/pom.xml | 2 +- stateless-parent/stateless-examples/pom.xml | 2 +- stateless-parent/stateless/pom.xml | 2 +- tinymce3-parent/pom.xml | 2 +- tinymce3-parent/tinymce3-examples/pom.xml | 2 +- tinymce3-parent/tinymce3/pom.xml | 2 +- tinymce4-parent/pom.xml | 2 +- tinymce4-parent/tinymce4-examples/pom.xml | 2 +- tinymce4-parent/tinymce4/pom.xml | 2 +- twitter-parent/pom.xml | 2 +- twitter-parent/twitter-examples/pom.xml | 2 +- twitter-parent/twitter/pom.xml | 2 +- urlfragment-parent/pom.xml | 2 +- urlfragment-parent/urlfragment-example/pom.xml | 2 +- urlfragment-parent/urlfragment/pom.xml | 2 +- whiteboard-parent/pom.xml | 2 +- whiteboard-parent/whiteboard-examples/pom.xml | 2 +- whiteboard-parent/whiteboard/pom.xml | 2 +- wicket-bundle-parent/pom.xml | 2 +- wicket-bundle-parent/wicket-bundle/pom.xml | 2 +- wicket-bundle-parent/wicket-ioc-bundle/pom.xml | 2 +- wicket-facebook-parent/pom.xml | 2 +- wicket-facebook-parent/wicket-facebook-examples/pom.xml | 2 +- wicket-facebook-parent/wicket-facebook/pom.xml | 2 +- wicket-foundation/pom.xml | 2 +- wicket-foundation/wicket-foundation-core/pom.xml | 2 +- wicket-foundation/wicket-foundation-samples/pom.xml | 2 +- wicket-html5-parent/pom.xml | 2 +- wicket-html5-parent/wicket-html5-examples/pom.xml | 2 +- wicket-html5-parent/wicket-html5/pom.xml | 2 +- wicket-mount-parent/pom.xml | 2 +- wicket-mount-parent/wicket-mount-core/pom.xml | 2 +- wicket-mount-parent/wicket-mount-example/pom.xml | 2 +- wicket-mount-parent/wicket-mount/pom.xml | 2 +- wicket-osgi-parent/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi-test-service/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi-test-web/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi/pom.xml | 2 +- wicket-poi-parent/pom.xml | 2 +- wicket-poi-parent/wicket-poi-examples/pom.xml | 2 +- wicket-poi-parent/wicket-poi/pom.xml | 2 +- wicket-security-parent/pom.xml | 2 +- wicket-security-parent/swarm-parent/hive/pom.xml | 2 +- wicket-security-parent/swarm-parent/pom.xml | 2 +- wicket-security-parent/swarm-parent/swarm/pom.xml | 2 +- wicket-security-parent/wasp-parent/pom.xml | 2 +- wicket-security-parent/wasp-parent/wasp/pom.xml | 2 +- wicket-security-parent/wasp-parent/wicomsec/pom.xml | 2 +- wicket-servlet3-parent/pom.xml | 2 +- wicket-servlet3-parent/wicket-servlet3-auth/pom.xml | 2 +- wicket-servlet3-parent/wicket-servlet3-examples/pom.xml | 2 +- wicketstuff-glassfish4-integration/pom.xml | 2 +- wicketstuff-lazymodel/pom.xml | 2 +- wicketstuff-logback-parent/pom.xml | 2 +- wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml | 2 +- wicketstuff-logback-parent/wicketstuff-logback/pom.xml | 2 +- wicketstuff-restannotations-parent/pom.xml | 2 +- .../restannotations-examples/pom.xml | 2 +- wicketstuff-restannotations-parent/restannotations-json/pom.xml | 2 +- wicketstuff-restannotations-parent/restannotations/pom.xml | 2 +- wicketstuff-selectize-parent/pom.xml | 2 +- .../wicketstuff-selectize-examples/pom.xml | 2 +- wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml | 2 +- wicketstuff-springreference-parent/pom.xml | 2 +- .../wicketstuff-springreference-examples/pom.xml | 2 +- .../wicketstuff-springreference/pom.xml | 2 +- yui-parent/pom.xml | 2 +- yui-parent/yui-calendar/pom.xml | 2 +- yui-parent/yui-common/pom.xml | 2 +- 235 files changed, 235 insertions(+), 235 deletions(-) diff --git a/annotation/pom.xml b/annotation/pom.xml index 10a59bf4c7..99b3cde3a0 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-annotation diff --git a/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml b/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml index ed425acba1..44236c2d92 100644 --- a/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml +++ b/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-annotationeventdispatcher-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-annotationeventdispatcher diff --git a/annotationeventdispatcher-parent/pom.xml b/annotationeventdispatcher-parent/pom.xml index 2afabfcd98..9fae0cbfb1 100644 --- a/annotationeventdispatcher-parent/pom.xml +++ b/annotationeventdispatcher-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-annotationeventdispatcher-parent Annotation Event Dispatcher - Parent diff --git a/async-tasks-parent/async-tasks-demo/pom.xml b/async-tasks-parent/async-tasks-demo/pom.xml index 210d7222ac..af6a0413f8 100644 --- a/async-tasks-parent/async-tasks-demo/pom.xml +++ b/async-tasks-parent/async-tasks-demo/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff async-tasks-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT async-task-demo diff --git a/async-tasks-parent/async-tasks-impl/pom.xml b/async-tasks-parent/async-tasks-impl/pom.xml index 0a0645df32..be52e107e9 100644 --- a/async-tasks-parent/async-tasks-impl/pom.xml +++ b/async-tasks-parent/async-tasks-impl/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff async-tasks-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT async-task-impl diff --git a/async-tasks-parent/pom.xml b/async-tasks-parent/pom.xml index a66353ae8d..40f81b8396 100644 --- a/async-tasks-parent/pom.xml +++ b/async-tasks-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT async-tasks-parent diff --git a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml index 063e3641d6..2a8e0de73d 100644 --- a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml +++ b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-autocomplete-tagit-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-autocomplete-tagit-examples diff --git a/autocomplete-tagit-parent/autocomplete-tagit/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit/pom.xml index 0108a4dd6b..733df606c3 100644 --- a/autocomplete-tagit-parent/autocomplete-tagit/pom.xml +++ b/autocomplete-tagit-parent/autocomplete-tagit/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-autocomplete-tagit-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-autocomplete-tagit diff --git a/autocomplete-tagit-parent/pom.xml b/autocomplete-tagit-parent/pom.xml index 4d19af8759..52c823eb4a 100644 --- a/autocomplete-tagit-parent/pom.xml +++ b/autocomplete-tagit-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-autocomplete-tagit-parent Autocomplete Tag It Parent diff --git a/browserid-parent/browserid-examples/pom.xml b/browserid-parent/browserid-examples/pom.xml index 930e1fcfd1..d7fae50fc6 100644 --- a/browserid-parent/browserid-examples/pom.xml +++ b/browserid-parent/browserid-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-browserid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-browserid-examples diff --git a/browserid-parent/browserid/pom.xml b/browserid-parent/browserid/pom.xml index c8fcbfacb6..070fe55e96 100644 --- a/browserid-parent/browserid/pom.xml +++ b/browserid-parent/browserid/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-browserid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-browserid diff --git a/browserid-parent/pom.xml b/browserid-parent/pom.xml index d704051d4b..4ddb5c9790 100644 --- a/browserid-parent/pom.xml +++ b/browserid-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-browserid-parent BrowserId Parent diff --git a/closure-compiler/pom.xml b/closure-compiler/pom.xml index b535d4f449..c8c16bd2a3 100644 --- a/closure-compiler/pom.xml +++ b/closure-compiler/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-closure-compiler diff --git a/dashboard-parent/dashboard-core/pom.xml b/dashboard-parent/dashboard-core/pom.xml index 4a23688874..6bd02625c9 100644 --- a/dashboard-parent/dashboard-core/pom.xml +++ b/dashboard-parent/dashboard-core/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-core diff --git a/dashboard-parent/dashboard-examples/pom.xml b/dashboard-parent/dashboard-examples/pom.xml index 9b6da12098..45e96cd1a1 100644 --- a/dashboard-parent/dashboard-examples/pom.xml +++ b/dashboard-parent/dashboard-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-examples diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml index 7aed3a0162..613d087a28 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets-charts diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml index 16974c6ddf..7299cb2cfa 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets-jqplot diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml index 748098f7a8..03e8972c01 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets-justgage diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml index 579b4d38ef..97794fe0ee 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets-loremipsum diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml index 835525a814..503a6724ff 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets-ofchart diff --git a/dashboard-parent/dashboard-widgets/pom.xml b/dashboard-parent/dashboard-widgets/pom.xml index bc4a327bf7..7d41b92897 100644 --- a/dashboard-parent/dashboard-widgets/pom.xml +++ b/dashboard-parent/dashboard-widgets/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-widgets diff --git a/dashboard-parent/pom.xml b/dashboard-parent/pom.xml index 2e431da4fa..05bdcdbc4a 100644 --- a/dashboard-parent/pom.xml +++ b/dashboard-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-dashboard-parent diff --git a/datastores-parent/datastore-cassandra/pom.xml b/datastores-parent/datastore-cassandra/pom.xml index 35a4c49d64..fafac91600 100644 --- a/datastores-parent/datastore-cassandra/pom.xml +++ b/datastores-parent/datastore-cassandra/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-common/pom.xml b/datastores-parent/datastore-common/pom.xml index 6e4a470955..20f815de96 100644 --- a/datastores-parent/datastore-common/pom.xml +++ b/datastores-parent/datastore-common/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-hazelcast/pom.xml b/datastores-parent/datastore-hazelcast/pom.xml index b27ad094e1..1094b90c69 100644 --- a/datastores-parent/datastore-hazelcast/pom.xml +++ b/datastores-parent/datastore-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-ignite/pom.xml b/datastores-parent/datastore-ignite/pom.xml index 767782659e..dc5861b94a 100644 --- a/datastores-parent/datastore-ignite/pom.xml +++ b/datastores-parent/datastore-ignite/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-memcached/pom.xml b/datastores-parent/datastore-memcached/pom.xml index a71c8ae52c..0e89938200 100644 --- a/datastores-parent/datastore-memcached/pom.xml +++ b/datastores-parent/datastore-memcached/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-redis/pom.xml b/datastores-parent/datastore-redis/pom.xml index 2eaf7976f3..75c7096b61 100644 --- a/datastores-parent/datastore-redis/pom.xml +++ b/datastores-parent/datastore-redis/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/pom.xml b/datastores-parent/pom.xml index 9ae1634f85..cb65fcf7db 100644 --- a/datastores-parent/pom.xml +++ b/datastores-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT datastores-parent diff --git a/datatables-parent/datatables-examples/pom.xml b/datatables-parent/datatables-examples/pom.xml index ad3c01a1a8..eb57f0c1c4 100644 --- a/datatables-parent/datatables-examples/pom.xml +++ b/datatables-parent/datatables-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff datatables-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT datatables-examples diff --git a/datatables-parent/datatables/pom.xml b/datatables-parent/datatables/pom.xml index 70afab0d98..7087c795ad 100755 --- a/datatables-parent/datatables/pom.xml +++ b/datatables-parent/datatables/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff datatables-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-datatables diff --git a/datatables-parent/pom.xml b/datatables-parent/pom.xml index 89de79d499..a7ae6f7a54 100644 --- a/datatables-parent/pom.xml +++ b/datatables-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT datatables-parent diff --git a/editable-grid-parent/editable-grid-examples/pom.xml b/editable-grid-parent/editable-grid-examples/pom.xml index a5f5aa0b39..9f05d07866 100644 --- a/editable-grid-parent/editable-grid-examples/pom.xml +++ b/editable-grid-parent/editable-grid-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff editable-grid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT editable-grid-examples war diff --git a/editable-grid-parent/editable-grid/pom.xml b/editable-grid-parent/editable-grid/pom.xml index c8e65a0c0c..59fd2e3417 100644 --- a/editable-grid-parent/editable-grid/pom.xml +++ b/editable-grid-parent/editable-grid/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff editable-grid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-editable-grid Editable Grid component for Apache Wicket diff --git a/editable-grid-parent/pom.xml b/editable-grid-parent/pom.xml index 34a0f41088..043c3bc232 100644 --- a/editable-grid-parent/pom.xml +++ b/editable-grid-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT editable-grid-parent diff --git a/flot-parent/flot-examples/pom.xml b/flot-parent/flot-examples/pom.xml index bea7eda941..8a0118cece 100644 --- a/flot-parent/flot-examples/pom.xml +++ b/flot-parent/flot-examples/pom.xml @@ -6,7 +6,7 @@ flot-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT flot-examples diff --git a/flot-parent/flot/pom.xml b/flot-parent/flot/pom.xml index 852279809c..467856b37a 100644 --- a/flot-parent/flot/pom.xml +++ b/flot-parent/flot/pom.xml @@ -6,7 +6,7 @@ flot-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-flot diff --git a/flot-parent/pom.xml b/flot-parent/pom.xml index 42d1673c1c..336b1c5608 100644 --- a/flot-parent/pom.xml +++ b/flot-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT flot-parent diff --git a/gae-initializer-parent/gae-initializer-example/pom.xml b/gae-initializer-parent/gae-initializer-example/pom.xml index 1ee5857826..57171ec720 100644 --- a/gae-initializer-parent/gae-initializer-example/pom.xml +++ b/gae-initializer-parent/gae-initializer-example/pom.xml @@ -6,7 +6,7 @@ gae-initializer-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT gae-initializer-example diff --git a/gae-initializer-parent/gae-initializer/pom.xml b/gae-initializer-parent/gae-initializer/pom.xml index d615e55dcf..172d110da6 100644 --- a/gae-initializer-parent/gae-initializer/pom.xml +++ b/gae-initializer-parent/gae-initializer/pom.xml @@ -6,7 +6,7 @@ gae-initializer-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-gae-initializer diff --git a/gae-initializer-parent/pom.xml b/gae-initializer-parent/pom.xml index 3790f207f0..601606704f 100644 --- a/gae-initializer-parent/pom.xml +++ b/gae-initializer-parent/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT gae-initializer-parent diff --git a/gmap3-parent/gmap3-examples/pom.xml b/gmap3-parent/gmap3-examples/pom.xml index de03571c75..164187dba5 100644 --- a/gmap3-parent/gmap3-examples/pom.xml +++ b/gmap3-parent/gmap3-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff gmap3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-gmap3-examples diff --git a/gmap3-parent/gmap3/pom.xml b/gmap3-parent/gmap3/pom.xml index 591845d252..73202754f8 100644 --- a/gmap3-parent/gmap3/pom.xml +++ b/gmap3-parent/gmap3/pom.xml @@ -21,7 +21,7 @@ limitations under the License. org.wicketstuff gmap3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-gmap3 diff --git a/gmap3-parent/pom.xml b/gmap3-parent/pom.xml index e3df6c0c1c..2bffab2325 100644 --- a/gmap3-parent/pom.xml +++ b/gmap3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT gmap3-parent diff --git a/googlecharts-parent/googlecharts-examples/pom.xml b/googlecharts-parent/googlecharts-examples/pom.xml index 296a079da7..30917add87 100644 --- a/googlecharts-parent/googlecharts-examples/pom.xml +++ b/googlecharts-parent/googlecharts-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff googlecharts-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT googlecharts-examples diff --git a/googlecharts-parent/googlecharts/pom.xml b/googlecharts-parent/googlecharts/pom.xml index bf6f6734df..764b0a5cab 100644 --- a/googlecharts-parent/googlecharts/pom.xml +++ b/googlecharts-parent/googlecharts/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff googlecharts-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-googlecharts jar diff --git a/googlecharts-parent/pom.xml b/googlecharts-parent/pom.xml index 9420e5a4e8..25398f2c56 100644 --- a/googlecharts-parent/pom.xml +++ b/googlecharts-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT googlecharts-parent diff --git a/htmlcompressor-parent/htmlcompressor-examples/pom.xml b/htmlcompressor-parent/htmlcompressor-examples/pom.xml index 3dc5325fbc..7a33989d37 100644 --- a/htmlcompressor-parent/htmlcompressor-examples/pom.xml +++ b/htmlcompressor-parent/htmlcompressor-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-htmlcompressor-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-htmlcompressor-examples diff --git a/htmlcompressor-parent/htmlcompressor/pom.xml b/htmlcompressor-parent/htmlcompressor/pom.xml index 5f185e9a29..eee703bfcb 100644 --- a/htmlcompressor-parent/htmlcompressor/pom.xml +++ b/htmlcompressor-parent/htmlcompressor/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-htmlcompressor-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-htmlcompressor diff --git a/htmlcompressor-parent/pom.xml b/htmlcompressor-parent/pom.xml index e5569ca0bd..4373cabd16 100644 --- a/htmlcompressor-parent/pom.xml +++ b/htmlcompressor-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-htmlcompressor-parent diff --git a/inmethod-grid-parent/inmethod-grid-examples/pom.xml b/inmethod-grid-parent/inmethod-grid-examples/pom.xml index 0cf2516ca6..c6e2b14799 100644 --- a/inmethod-grid-parent/inmethod-grid-examples/pom.xml +++ b/inmethod-grid-parent/inmethod-grid-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff inmethod-grid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-inmethod-grid-examples diff --git a/inmethod-grid-parent/inmethod-grid/pom.xml b/inmethod-grid-parent/inmethod-grid/pom.xml index 3415bdddaa..20d2adf336 100644 --- a/inmethod-grid-parent/inmethod-grid/pom.xml +++ b/inmethod-grid-parent/inmethod-grid/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff inmethod-grid-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-inmethod-grid diff --git a/inmethod-grid-parent/pom.xml b/inmethod-grid-parent/pom.xml index 46844b0adc..dbd8606a6f 100644 --- a/inmethod-grid-parent/pom.xml +++ b/inmethod-grid-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT inmethod-grid-parent diff --git a/input-events-parent/input-events-examples/pom.xml b/input-events-parent/input-events-examples/pom.xml index 3480b243dd..d88f2881d1 100644 --- a/input-events-parent/input-events-examples/pom.xml +++ b/input-events-parent/input-events-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff input-events-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT input-events-examples diff --git a/input-events-parent/input-events/pom.xml b/input-events-parent/input-events/pom.xml index 2d968c8c2c..391832cf0a 100644 --- a/input-events-parent/input-events/pom.xml +++ b/input-events-parent/input-events/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff input-events-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-input-events diff --git a/input-events-parent/pom.xml b/input-events-parent/pom.xml index f7df1393b1..5f4f664805 100644 --- a/input-events-parent/pom.xml +++ b/input-events-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT input-events-parent diff --git a/jamon-parent/jamon-examples/pom.xml b/jamon-parent/jamon-examples/pom.xml index 4046df193d..dac59b17ae 100644 --- a/jamon-parent/jamon-examples/pom.xml +++ b/jamon-parent/jamon-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-jamon-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jamon-examples Jamon examples diff --git a/jamon-parent/jamon/pom.xml b/jamon-parent/jamon/pom.xml index 8d15f13d2c..de81889d1e 100644 --- a/jamon-parent/jamon/pom.xml +++ b/jamon-parent/jamon/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-jamon-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jamon Jamon diff --git a/jamon-parent/pom.xml b/jamon-parent/pom.xml index 9dec0f84e0..823e6aaafd 100644 --- a/jamon-parent/pom.xml +++ b/jamon-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jamon-parent pom diff --git a/jasperreports-parent/jasperreports-examples/pom.xml b/jasperreports-parent/jasperreports-examples/pom.xml index 26a35b2b43..3e6406af6b 100644 --- a/jasperreports-parent/jasperreports-examples/pom.xml +++ b/jasperreports-parent/jasperreports-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff jasperreports-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jasperreports-examples diff --git a/jasperreports-parent/jasperreports/pom.xml b/jasperreports-parent/jasperreports/pom.xml index 5a7f851a2d..7f369df67f 100644 --- a/jasperreports-parent/jasperreports/pom.xml +++ b/jasperreports-parent/jasperreports/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff jasperreports-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jasperreports diff --git a/jasperreports-parent/pom.xml b/jasperreports-parent/pom.xml index 4316c5db03..935c6c8823 100644 --- a/jasperreports-parent/pom.xml +++ b/jasperreports-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jasperreports-parent diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml index 6059ff9eab..4e86487b26 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT javaee-inject-example-ear ear diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml index e6ae9ad226..1ff9791872 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT javaee-inject-example-ejb ejb diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml index 8ec3369754..323bcafd69 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT javaee-inject-example-war war diff --git a/javaee-inject-parent/javaee-inject-examples/pom.xml b/javaee-inject-parent/javaee-inject-examples/pom.xml index 8662078870..7575c2e426 100644 --- a/javaee-inject-parent/javaee-inject-examples/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT javaee-inject-examples pom diff --git a/javaee-inject-parent/javaee-inject/pom.xml b/javaee-inject-parent/javaee-inject/pom.xml index aa40f45d10..cb737c7fa9 100644 --- a/javaee-inject-parent/javaee-inject/pom.xml +++ b/javaee-inject-parent/javaee-inject/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-javaee-inject jar diff --git a/javaee-inject-parent/pom.xml b/javaee-inject-parent/pom.xml index c1f5524179..891c58e3d5 100644 --- a/javaee-inject-parent/pom.xml +++ b/javaee-inject-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT javaee-inject-parent pom diff --git a/jee-web-parent/jee-web-examples/pom.xml b/jee-web-parent/jee-web-examples/pom.xml index 0b67def582..aa3cb16e37 100644 --- a/jee-web-parent/jee-web-examples/pom.xml +++ b/jee-web-parent/jee-web-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff jee-web-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jee-web-examples war diff --git a/jee-web-parent/jee-web/pom.xml b/jee-web-parent/jee-web/pom.xml index bfd51b9921..ef5cef77cd 100644 --- a/jee-web-parent/jee-web/pom.xml +++ b/jee-web-parent/jee-web/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff jee-web-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jee-web jar diff --git a/jee-web-parent/pom.xml b/jee-web-parent/pom.xml index 25d9adef3b..897a275a3b 100644 --- a/jee-web-parent/pom.xml +++ b/jee-web-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jee-web-parent pom diff --git a/jqplot-parent/jqplot-examples/pom.xml b/jqplot-parent/jqplot-examples/pom.xml index e60e5e9b99..173992cbd1 100644 --- a/jqplot-parent/jqplot-examples/pom.xml +++ b/jqplot-parent/jqplot-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff jqplot-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jqplot-examples diff --git a/jqplot-parent/jqplot/pom.xml b/jqplot-parent/jqplot/pom.xml index a58f9add0b..d185105436 100644 --- a/jqplot-parent/jqplot/pom.xml +++ b/jqplot-parent/jqplot/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jqplot-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jqplot diff --git a/jqplot-parent/pom.xml b/jqplot-parent/pom.xml index b86a6fa9d9..11ed31acf7 100644 --- a/jqplot-parent/pom.xml +++ b/jqplot-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jqplot-parent diff --git a/jquery-parent/jquery-examples/pom.xml b/jquery-parent/jquery-examples/pom.xml index cbbc6adfa2..809e9d8883 100644 --- a/jquery-parent/jquery-examples/pom.xml +++ b/jquery-parent/jquery-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jquery-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jquery-examples diff --git a/jquery-parent/jquery/pom.xml b/jquery-parent/jquery/pom.xml index e7feb4da36..3306132627 100755 --- a/jquery-parent/jquery/pom.xml +++ b/jquery-parent/jquery/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jquery-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jquery diff --git a/jquery-parent/pom.xml b/jquery-parent/pom.xml index 957d2310dd..b0b045565d 100644 --- a/jquery-parent/pom.xml +++ b/jquery-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT jquery-parent diff --git a/jwicket-parent/dropdown-menu/pom.xml b/jwicket-parent/dropdown-menu/pom.xml index 749913c3c0..d7617a24f0 100644 --- a/jwicket-parent/dropdown-menu/pom.xml +++ b/jwicket-parent/dropdown-menu/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-core/pom.xml b/jwicket-parent/jwicket-core/pom.xml index 7158c9fef6..5b6d6918cb 100644 --- a/jwicket-parent/jwicket-core/pom.xml +++ b/jwicket-parent/jwicket-core/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-examples/pom.xml b/jwicket-parent/jwicket-examples/pom.xml index 36971e75bb..2aab06d697 100644 --- a/jwicket-parent/jwicket-examples/pom.xml +++ b/jwicket-parent/jwicket-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jwicket-examples diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml index 558aa551b1..9b5a533e20 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml index e65c728f51..709f2e486d 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml index e8392fe138..ec560f4998 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/pom.xml b/jwicket-parent/jwicket-tooltip/pom.xml index 89b76cff1f..53d4ecde8b 100644 --- a/jwicket-parent/jwicket-tooltip/pom.xml +++ b/jwicket-parent/jwicket-tooltip/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml index a2047e24c6..587e834b46 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml index c01dad6994..e91aa24694 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml index f8c23bda03..e2060526ae 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml index 3ef727ff5a..3dabea8327 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml index afb1f785b0..68db804447 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml index d016c352d4..92ad5e985f 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml index 62616a2790..f811350f48 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml @@ -15,7 +15,7 @@ wicketstuff-jwicket-ui org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT ../pom.xml wicketstuff-jwicket-ui-tooltip diff --git a/jwicket-parent/jwicket-ui/pom.xml b/jwicket-parent/jwicket-ui/pom.xml index 2429ba51c9..9f22c4a06b 100644 --- a/jwicket-parent/jwicket-ui/pom.xml +++ b/jwicket-parent/jwicket-ui/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jwicket-ui diff --git a/jwicket-parent/pom.xml b/jwicket-parent/pom.xml index 2d770fe20c..6d1e0a00dd 100644 --- a/jwicket-parent/pom.xml +++ b/jwicket-parent/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-jwicket-parent diff --git a/lambda-parent/lambda-examples/pom.xml b/lambda-parent/lambda-examples/pom.xml index 37a50c5a42..39dee0d092 100644 --- a/lambda-parent/lambda-examples/pom.xml +++ b/lambda-parent/lambda-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-lambda-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-lambda-examples diff --git a/lambda-parent/lambda/pom.xml b/lambda-parent/lambda/pom.xml index 44249679e9..357daaf329 100644 --- a/lambda-parent/lambda/pom.xml +++ b/lambda-parent/lambda/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-lambda-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-lambda diff --git a/lambda-parent/pom.xml b/lambda-parent/pom.xml index e699929211..8931313dd4 100644 --- a/lambda-parent/pom.xml +++ b/lambda-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-lambda-parent diff --git a/lightbox2-parent/lightbox2-examples/pom.xml b/lightbox2-parent/lightbox2-examples/pom.xml index 55f2e7a2dd..8d2a48b749 100644 --- a/lightbox2-parent/lightbox2-examples/pom.xml +++ b/lightbox2-parent/lightbox2-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff lightbox2-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT lightbox2-examples diff --git a/lightbox2-parent/lightbox2/pom.xml b/lightbox2-parent/lightbox2/pom.xml index aec5806900..769f47e5f2 100644 --- a/lightbox2-parent/lightbox2/pom.xml +++ b/lightbox2-parent/lightbox2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff lightbox2-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT lightbox2 diff --git a/lightbox2-parent/pom.xml b/lightbox2-parent/pom.xml index c6d63eb636..2342c1649c 100644 --- a/lightbox2-parent/pom.xml +++ b/lightbox2-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT lightbox2-parent diff --git a/mbeanview-parent/mbeanview-examples/pom.xml b/mbeanview-parent/mbeanview-examples/pom.xml index 73f8849824..d55abafd68 100644 --- a/mbeanview-parent/mbeanview-examples/pom.xml +++ b/mbeanview-parent/mbeanview-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff mbeanview-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT mbeanview-examples diff --git a/mbeanview-parent/mbeanview/pom.xml b/mbeanview-parent/mbeanview/pom.xml index 3db09d78a5..ce4da785a9 100644 --- a/mbeanview-parent/mbeanview/pom.xml +++ b/mbeanview-parent/mbeanview/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff mbeanview-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-mbeanview diff --git a/mbeanview-parent/pom.xml b/mbeanview-parent/pom.xml index e5edb7e10b..51deba40b9 100644 --- a/mbeanview-parent/pom.xml +++ b/mbeanview-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT mbeanview-parent diff --git a/minis-parent/minis-examples/pom.xml b/minis-parent/minis-examples/pom.xml index f1a49728dd..6b4145f928 100644 --- a/minis-parent/minis-examples/pom.xml +++ b/minis-parent/minis-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff minis-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-minis-examples diff --git a/minis-parent/minis/pom.xml b/minis-parent/minis/pom.xml index 24db0dae81..fde08efdf6 100644 --- a/minis-parent/minis/pom.xml +++ b/minis-parent/minis/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff minis-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-minis diff --git a/minis-parent/pom.xml b/minis-parent/pom.xml index d8e69dd9b1..1a3e0f9e3c 100644 --- a/minis-parent/pom.xml +++ b/minis-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT minis-parent diff --git a/modalx-parent/modalx-examples/pom.xml b/modalx-parent/modalx-examples/pom.xml index cce4d190f1..c43f2ae3c4 100644 --- a/modalx-parent/modalx-examples/pom.xml +++ b/modalx-parent/modalx-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff modalx-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT modalx-examples diff --git a/modalx-parent/modalx/pom.xml b/modalx-parent/modalx/pom.xml index 3ce0d08156..d2e1161b80 100644 --- a/modalx-parent/modalx/pom.xml +++ b/modalx-parent/modalx/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff modalx-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT modalx diff --git a/modalx-parent/pom.xml b/modalx-parent/pom.xml index 9e0434686c..95a2f95b8a 100644 --- a/modalx-parent/pom.xml +++ b/modalx-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT modalx-parent ModalX Parent diff --git a/nashorn-parent/nashorn-examples/pom.xml b/nashorn-parent/nashorn-examples/pom.xml index 30b4db9ffd..e274039d81 100644 --- a/nashorn-parent/nashorn-examples/pom.xml +++ b/nashorn-parent/nashorn-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-nashorn-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-nashorn-examples diff --git a/nashorn-parent/nashorn/pom.xml b/nashorn-parent/nashorn/pom.xml index f2a9154ae5..952cc6913b 100644 --- a/nashorn-parent/nashorn/pom.xml +++ b/nashorn-parent/nashorn/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-nashorn-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-nashorn diff --git a/nashorn-parent/pom.xml b/nashorn-parent/pom.xml index da30f38d7d..36752c7d17 100644 --- a/nashorn-parent/pom.xml +++ b/nashorn-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-nashorn-parent diff --git a/objectautocomplete-parent/objectautocomplete-examples/pom.xml b/objectautocomplete-parent/objectautocomplete-examples/pom.xml index 5c0651e0bc..c523e25d97 100644 --- a/objectautocomplete-parent/objectautocomplete-examples/pom.xml +++ b/objectautocomplete-parent/objectautocomplete-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-objectautocomplete-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-objectautocomplete-examples diff --git a/objectautocomplete-parent/objectautocomplete/pom.xml b/objectautocomplete-parent/objectautocomplete/pom.xml index ad0d546d16..917ef12bbb 100644 --- a/objectautocomplete-parent/objectautocomplete/pom.xml +++ b/objectautocomplete-parent/objectautocomplete/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-objectautocomplete-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-objectautocomplete diff --git a/objectautocomplete-parent/pom.xml b/objectautocomplete-parent/pom.xml index e59e204d94..5a3e41ff61 100644 --- a/objectautocomplete-parent/pom.xml +++ b/objectautocomplete-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-objectautocomplete-parent diff --git a/offline-mode-parent/offline-mode-examples/pom.xml b/offline-mode-parent/offline-mode-examples/pom.xml index fd70152a08..3a628d8ba9 100644 --- a/offline-mode-parent/offline-mode-examples/pom.xml +++ b/offline-mode-parent/offline-mode-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-offline-mode-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-offline-mode-examples diff --git a/offline-mode-parent/offline-mode/pom.xml b/offline-mode-parent/offline-mode/pom.xml index 5e0f78fdf6..4c42569974 100644 --- a/offline-mode-parent/offline-mode/pom.xml +++ b/offline-mode-parent/offline-mode/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-offline-mode-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-offline-mode diff --git a/offline-mode-parent/pom.xml b/offline-mode-parent/pom.xml index cd1ba95ec5..b8e7e063c2 100644 --- a/offline-mode-parent/pom.xml +++ b/offline-mode-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-offline-mode-parent diff --git a/openlayers-parent/openlayers-examples/pom.xml b/openlayers-parent/openlayers-examples/pom.xml index 8939e5c023..22c926e3f9 100644 --- a/openlayers-parent/openlayers-examples/pom.xml +++ b/openlayers-parent/openlayers-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff openlayers-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT openlayers-examples diff --git a/openlayers-parent/openlayers-proxy/pom.xml b/openlayers-parent/openlayers-proxy/pom.xml index 28df739fa7..8f59406c17 100644 --- a/openlayers-parent/openlayers-proxy/pom.xml +++ b/openlayers-parent/openlayers-proxy/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-openlayers-proxy diff --git a/openlayers-parent/openlayers/pom.xml b/openlayers-parent/openlayers/pom.xml index 6714191940..2a167c0df0 100644 --- a/openlayers-parent/openlayers/pom.xml +++ b/openlayers-parent/openlayers/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-openlayers diff --git a/openlayers-parent/pom.xml b/openlayers-parent/pom.xml index 172b210411..c80cb778a5 100644 --- a/openlayers-parent/pom.xml +++ b/openlayers-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT openlayers-parent diff --git a/openlayers3-parent/openlayers3-bootstrap/pom.xml b/openlayers3-parent/openlayers3-bootstrap/pom.xml index afc8a3a950..2e9a927b48 100644 --- a/openlayers3-parent/openlayers3-bootstrap/pom.xml +++ b/openlayers3-parent/openlayers3-bootstrap/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-openlayers3-bootstrap diff --git a/openlayers3-parent/openlayers3-examples/pom.xml b/openlayers3-parent/openlayers3-examples/pom.xml index 49d4e587ed..45959331c3 100644 --- a/openlayers3-parent/openlayers3-examples/pom.xml +++ b/openlayers3-parent/openlayers3-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff openlayers3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT openlayers3-examples diff --git a/openlayers3-parent/openlayers3/pom.xml b/openlayers3-parent/openlayers3/pom.xml index 61a5dd73fb..54f79983ed 100644 --- a/openlayers3-parent/openlayers3/pom.xml +++ b/openlayers3-parent/openlayers3/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-openlayers3 diff --git a/openlayers3-parent/pom.xml b/openlayers3-parent/pom.xml index 3586175057..54f7fde950 100644 --- a/openlayers3-parent/pom.xml +++ b/openlayers3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT openlayers3-parent diff --git a/phonebook/pom.xml b/phonebook/pom.xml index 0aa8b1ca08..02ea0ec611 100644 --- a/phonebook/pom.xml +++ b/phonebook/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-phonebook diff --git a/plugin/pom.xml b/plugin/pom.xml index 6db45e8182..a0dd4865c8 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-plugin diff --git a/pom.xml b/pom.xml index a1a7212254..51e1f0e158 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core pom - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT WicketStuff Core Parent WicketStuff Core Parent is the parent project for all of the core WicketStuff projects. It tries diff --git a/portlet-parent/pom.xml b/portlet-parent/pom.xml index f9411e917c..e25cffe6d0 100644 --- a/portlet-parent/pom.xml +++ b/portlet-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-portlet-parent Portlet Parent diff --git a/portlet-parent/wicketstuff-portlet-examples/pom.xml b/portlet-parent/wicketstuff-portlet-examples/pom.xml index 271f7d149d..a302b91c15 100644 --- a/portlet-parent/wicketstuff-portlet-examples/pom.xml +++ b/portlet-parent/wicketstuff-portlet-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-portlet-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-portlet-examples diff --git a/portlet-parent/wicketstuff-portlet/pom.xml b/portlet-parent/wicketstuff-portlet/pom.xml index b38fff576f..9389af4e06 100644 --- a/portlet-parent/wicketstuff-portlet/pom.xml +++ b/portlet-parent/wicketstuff-portlet/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-portlet-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-portlet diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index 582c6c9766..503fd7f488 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT progressbar-parent diff --git a/progressbar-parent/progressbar-example/pom.xml b/progressbar-parent/progressbar-example/pom.xml index e95f2e4143..73042339f1 100644 --- a/progressbar-parent/progressbar-example/pom.xml +++ b/progressbar-parent/progressbar-example/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff progressbar-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT progressbar-example diff --git a/progressbar-parent/progressbar-spring/pom.xml b/progressbar-parent/progressbar-spring/pom.xml index 8f2e02f081..553366f79e 100644 --- a/progressbar-parent/progressbar-spring/pom.xml +++ b/progressbar-parent/progressbar-spring/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff progressbar-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-progressbar-spring TaskService for use with user submitted background tasks and the progress bar. Could be used with Spring or any other application framework. diff --git a/progressbar-parent/progressbar/pom.xml b/progressbar-parent/progressbar/pom.xml index 785566b488..7ef9fd4cf2 100644 --- a/progressbar-parent/progressbar/pom.xml +++ b/progressbar-parent/progressbar/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff progressbar-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-progressbar diff --git a/push-parent/pom.xml b/push-parent/pom.xml index e98549b4fb..06f3f8d830 100644 --- a/push-parent/pom.xml +++ b/push-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT push-parent diff --git a/push-parent/push-cometd/pom.xml b/push-parent/push-cometd/pom.xml index 5f89b74017..8024c8ca2d 100644 --- a/push-parent/push-cometd/pom.xml +++ b/push-parent/push-cometd/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff push-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-push-cometd diff --git a/push-parent/push-core/pom.xml b/push-parent/push-core/pom.xml index dfb7f9f8a0..e01f94624d 100644 --- a/push-parent/push-core/pom.xml +++ b/push-parent/push-core/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff push-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-push-core diff --git a/push-parent/push-examples/pom.xml b/push-parent/push-examples/pom.xml index 8fc458e10b..f40485a7bf 100644 --- a/push-parent/push-examples/pom.xml +++ b/push-parent/push-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff push-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-push-examples diff --git a/push-parent/push-timer/pom.xml b/push-parent/push-timer/pom.xml index 5af5fab271..a96db0246d 100644 --- a/push-parent/push-timer/pom.xml +++ b/push-parent/push-timer/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff push-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-push-timer diff --git a/scala-extensions-parent/pom.xml b/scala-extensions-parent/pom.xml index 92dcd1db39..b3c91659a4 100644 --- a/scala-extensions-parent/pom.xml +++ b/scala-extensions-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT org.wicketstuff.scala diff --git a/scala-extensions-parent/wicket-scala-archetype/pom.xml b/scala-extensions-parent/wicket-scala-archetype/pom.xml index e876a637c8..c7c050a48e 100644 --- a/scala-extensions-parent/wicket-scala-archetype/pom.xml +++ b/scala-extensions-parent/wicket-scala-archetype/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT maven-archetype diff --git a/scala-extensions-parent/wicket-scala-sample/pom.xml b/scala-extensions-parent/wicket-scala-sample/pom.xml index 92a0dbdd80..54f9154fa8 100644 --- a/scala-extensions-parent/wicket-scala-sample/pom.xml +++ b/scala-extensions-parent/wicket-scala-sample/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-sample diff --git a/scala-extensions-parent/wicket-scala/pom.xml b/scala-extensions-parent/wicket-scala/pom.xml index d4a769a829..11dbf7c490 100644 --- a/scala-extensions-parent/wicket-scala/pom.xml +++ b/scala-extensions-parent/wicket-scala/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-scala diff --git a/select2-parent/pom.xml b/select2-parent/pom.xml index bd04c8ba43..db7bfed39e 100755 --- a/select2-parent/pom.xml +++ b/select2-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-select2-parent pom diff --git a/select2-parent/select2-examples/pom.xml b/select2-parent/select2-examples/pom.xml index a55740a187..98ab714780 100755 --- a/select2-parent/select2-examples/pom.xml +++ b/select2-parent/select2-examples/pom.xml @@ -4,7 +4,7 @@ wicketstuff-select2-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-select2-examples war diff --git a/select2-parent/select2/pom.xml b/select2-parent/select2/pom.xml index 4af99095d7..06fca9611a 100755 --- a/select2-parent/select2/pom.xml +++ b/select2-parent/select2/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-select2-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 wicketstuff-select2 diff --git a/serializer-common/pom.xml b/serializer-common/pom.xml index efc8c3a0e7..9c1a8cb89c 100644 --- a/serializer-common/pom.xml +++ b/serializer-common/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-common diff --git a/serializer-fast/pom.xml b/serializer-fast/pom.xml index c6450236fd..526bd446cc 100644 --- a/serializer-fast/pom.xml +++ b/serializer-fast/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-fast diff --git a/serializer-fast2/pom.xml b/serializer-fast2/pom.xml index 262893686c..3b5962cd53 100644 --- a/serializer-fast2/pom.xml +++ b/serializer-fast2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-fast2 diff --git a/serializer-kryo/pom.xml b/serializer-kryo/pom.xml index c7f340a2f2..6086da9b84 100644 --- a/serializer-kryo/pom.xml +++ b/serializer-kryo/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-kryo diff --git a/serializer-kryo2/pom.xml b/serializer-kryo2/pom.xml index fd675f3703..effbfbff42 100644 --- a/serializer-kryo2/pom.xml +++ b/serializer-kryo2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-kryo2 diff --git a/serializer-ui/pom.xml b/serializer-ui/pom.xml index b26907d1de..5ce0469c7f 100644 --- a/serializer-ui/pom.xml +++ b/serializer-ui/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-serializer-ui diff --git a/shiro-security/pom.xml b/shiro-security/pom.xml index c68a3c0dc7..f1ce56b217 100644 --- a/shiro-security/pom.xml +++ b/shiro-security/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-parent diff --git a/shiro-security/wicket-shiro-examples/pom.xml b/shiro-security/wicket-shiro-examples/pom.xml index 943552d0c7..933a6c0b44 100644 --- a/shiro-security/wicket-shiro-examples/pom.xml +++ b/shiro-security/wicket-shiro-examples/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicket-shiro-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-examples diff --git a/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml index 6263e93761..43eff0a2c2 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-example-base diff --git a/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml index a8de1de78a..e34a3e94c4 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-example-realm diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml index 7fffd61561..63da448f1d 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-example-spring-hibernate-native diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml index 19dc977199..6035bafc44 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-example-spring-hibernate diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml index 4ada856fc6..399fcecce9 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-shiro-example-spring-jdbc diff --git a/shiro-security/wicket-shiro/pom.xml b/shiro-security/wicket-shiro/pom.xml index dd5e4b7b6b..09e4830783 100644 --- a/shiro-security/wicket-shiro/pom.xml +++ b/shiro-security/wicket-shiro/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicket-shiro-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-shiro diff --git a/simile-timeline-parent/pom.xml b/simile-timeline-parent/pom.xml index aa0ab076c5..5ac7fbc837 100644 --- a/simile-timeline-parent/pom.xml +++ b/simile-timeline-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT simile-timeline-parent diff --git a/simile-timeline-parent/simile-timeline/pom.xml b/simile-timeline-parent/simile-timeline/pom.xml index 0525bd637f..acad094707 100644 --- a/simile-timeline-parent/simile-timeline/pom.xml +++ b/simile-timeline-parent/simile-timeline/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff simile-timeline-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-simile-timeline diff --git a/sitemap-xml-parent/pom.xml b/sitemap-xml-parent/pom.xml index fb537ae677..77673a5aab 100644 --- a/sitemap-xml-parent/pom.xml +++ b/sitemap-xml-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT sitemap-xml-parent diff --git a/sitemap-xml-parent/sitemap-xml-examples/pom.xml b/sitemap-xml-parent/sitemap-xml-examples/pom.xml index 19979d350e..bc1e252a8c 100644 --- a/sitemap-xml-parent/sitemap-xml-examples/pom.xml +++ b/sitemap-xml-parent/sitemap-xml-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff sitemap-xml-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT sitemap-xml-examples wicketstuff-sitemap-xml-examples diff --git a/sitemap-xml-parent/sitemap-xml/pom.xml b/sitemap-xml-parent/sitemap-xml/pom.xml index 2d3ed8aca1..751fe7d7b5 100644 --- a/sitemap-xml-parent/sitemap-xml/pom.xml +++ b/sitemap-xml-parent/sitemap-xml/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff sitemap-xml-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-sitemap-xml jar diff --git a/stateless-parent/pom.xml b/stateless-parent/pom.xml index 9e69883466..34f65ec475 100644 --- a/stateless-parent/pom.xml +++ b/stateless-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-stateless-parent diff --git a/stateless-parent/stateless-examples/pom.xml b/stateless-parent/stateless-examples/pom.xml index 9a182e2e5d..e1ae356570 100644 --- a/stateless-parent/stateless-examples/pom.xml +++ b/stateless-parent/stateless-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-stateless-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-stateless-examples diff --git a/stateless-parent/stateless/pom.xml b/stateless-parent/stateless/pom.xml index f3b708a99a..99a0c8cab6 100644 --- a/stateless-parent/stateless/pom.xml +++ b/stateless-parent/stateless/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-stateless-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-stateless diff --git a/tinymce3-parent/pom.xml b/tinymce3-parent/pom.xml index 45e9f5254e..b6fbfe9ab8 100644 --- a/tinymce3-parent/pom.xml +++ b/tinymce3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT tinymce3-parent diff --git a/tinymce3-parent/tinymce3-examples/pom.xml b/tinymce3-parent/tinymce3-examples/pom.xml index 79dc61aaf3..bf56a05398 100644 --- a/tinymce3-parent/tinymce3-examples/pom.xml +++ b/tinymce3-parent/tinymce3-examples/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT tinymce3-examples diff --git a/tinymce3-parent/tinymce3/pom.xml b/tinymce3-parent/tinymce3/pom.xml index 009cbca54f..36f7219e28 100644 --- a/tinymce3-parent/tinymce3/pom.xml +++ b/tinymce3-parent/tinymce3/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-tinymce3 diff --git a/tinymce4-parent/pom.xml b/tinymce4-parent/pom.xml index ad838574a3..ca51a492b0 100644 --- a/tinymce4-parent/pom.xml +++ b/tinymce4-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT tinymce4-parent diff --git a/tinymce4-parent/tinymce4-examples/pom.xml b/tinymce4-parent/tinymce4-examples/pom.xml index dc9c86cb8f..de32556931 100644 --- a/tinymce4-parent/tinymce4-examples/pom.xml +++ b/tinymce4-parent/tinymce4-examples/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce4-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT tinymce4-examples diff --git a/tinymce4-parent/tinymce4/pom.xml b/tinymce4-parent/tinymce4/pom.xml index 460435ba92..5164717a42 100644 --- a/tinymce4-parent/tinymce4/pom.xml +++ b/tinymce4-parent/tinymce4/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce4-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-tinymce4 diff --git a/twitter-parent/pom.xml b/twitter-parent/pom.xml index 3575b2ccbf..a05667bb91 100644 --- a/twitter-parent/pom.xml +++ b/twitter-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT twitter-parent diff --git a/twitter-parent/twitter-examples/pom.xml b/twitter-parent/twitter-examples/pom.xml index 11eb5c5e3a..d8dce37076 100644 --- a/twitter-parent/twitter-examples/pom.xml +++ b/twitter-parent/twitter-examples/pom.xml @@ -3,7 +3,7 @@ twitter-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-twitter-examples war diff --git a/twitter-parent/twitter/pom.xml b/twitter-parent/twitter/pom.xml index 2ea914eaea..687e79c0e2 100644 --- a/twitter-parent/twitter/pom.xml +++ b/twitter-parent/twitter/pom.xml @@ -3,7 +3,7 @@ twitter-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-twitter diff --git a/urlfragment-parent/pom.xml b/urlfragment-parent/pom.xml index ff54192c51..d231f0e412 100644 --- a/urlfragment-parent/pom.xml +++ b/urlfragment-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-urlfragment-parent diff --git a/urlfragment-parent/urlfragment-example/pom.xml b/urlfragment-parent/urlfragment-example/pom.xml index 0aa877b73a..f110e15b06 100644 --- a/urlfragment-parent/urlfragment-example/pom.xml +++ b/urlfragment-parent/urlfragment-example/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicketstuff-urlfragment-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-urlfragment-examples diff --git a/urlfragment-parent/urlfragment/pom.xml b/urlfragment-parent/urlfragment/pom.xml index 272a4196c2..bde4fda95d 100644 --- a/urlfragment-parent/urlfragment/pom.xml +++ b/urlfragment-parent/urlfragment/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-urlfragment-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 wicketstuff-urlfragment diff --git a/whiteboard-parent/pom.xml b/whiteboard-parent/pom.xml index 66c5ecd3c2..633efcee31 100644 --- a/whiteboard-parent/pom.xml +++ b/whiteboard-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-whiteboard-parent diff --git a/whiteboard-parent/whiteboard-examples/pom.xml b/whiteboard-parent/whiteboard-examples/pom.xml index 3808fbdc32..5b2f512ac7 100644 --- a/whiteboard-parent/whiteboard-examples/pom.xml +++ b/whiteboard-parent/whiteboard-examples/pom.xml @@ -7,7 +7,7 @@ wicketstuff-whiteboard-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-whiteboard-examples diff --git a/whiteboard-parent/whiteboard/pom.xml b/whiteboard-parent/whiteboard/pom.xml index 7eb267e939..f263be94dd 100644 --- a/whiteboard-parent/whiteboard/pom.xml +++ b/whiteboard-parent/whiteboard/pom.xml @@ -7,7 +7,7 @@ wicketstuff-whiteboard-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-whiteboard diff --git a/wicket-bundle-parent/pom.xml b/wicket-bundle-parent/pom.xml index cd73b734aa..f5cf8f21d7 100644 --- a/wicket-bundle-parent/pom.xml +++ b/wicket-bundle-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-bundle-parent diff --git a/wicket-bundle-parent/wicket-bundle/pom.xml b/wicket-bundle-parent/wicket-bundle/pom.xml index 03cd77faa8..a6bd222ae8 100644 --- a/wicket-bundle-parent/wicket-bundle/pom.xml +++ b/wicket-bundle-parent/wicket-bundle/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicket-bundle-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-bundle diff --git a/wicket-bundle-parent/wicket-ioc-bundle/pom.xml b/wicket-bundle-parent/wicket-ioc-bundle/pom.xml index ff794dd146..37739140e8 100644 --- a/wicket-bundle-parent/wicket-ioc-bundle/pom.xml +++ b/wicket-bundle-parent/wicket-ioc-bundle/pom.xml @@ -3,7 +3,7 @@ wicket-bundle-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-ioc-bundle bundle diff --git a/wicket-facebook-parent/pom.xml b/wicket-facebook-parent/pom.xml index 2674b5d72e..98efe40260 100644 --- a/wicket-facebook-parent/pom.xml +++ b/wicket-facebook-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT Wicket Facebook :: Parent diff --git a/wicket-facebook-parent/wicket-facebook-examples/pom.xml b/wicket-facebook-parent/wicket-facebook-examples/pom.xml index 69b8bc03cd..3283c2f508 100644 --- a/wicket-facebook-parent/wicket-facebook-examples/pom.xml +++ b/wicket-facebook-parent/wicket-facebook-examples/pom.xml @@ -4,7 +4,7 @@ wicket-facebook-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-facebook-examples Wicket Facebook Examples diff --git a/wicket-facebook-parent/wicket-facebook/pom.xml b/wicket-facebook-parent/wicket-facebook/pom.xml index bab423e611..42f90c7638 100644 --- a/wicket-facebook-parent/wicket-facebook/pom.xml +++ b/wicket-facebook-parent/wicket-facebook/pom.xml @@ -4,7 +4,7 @@ wicket-facebook-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-facebook Wicket Facebook diff --git a/wicket-foundation/pom.xml b/wicket-foundation/pom.xml index f2763f5f80..a9925b897f 100644 --- a/wicket-foundation/pom.xml +++ b/wicket-foundation/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT org.wicketstuff.foundation diff --git a/wicket-foundation/wicket-foundation-core/pom.xml b/wicket-foundation/wicket-foundation-core/pom.xml index 3726a86e93..42f410bcb5 100644 --- a/wicket-foundation/wicket-foundation-core/pom.xml +++ b/wicket-foundation/wicket-foundation-core/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff.foundation wicket-foundation-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-foundation-core diff --git a/wicket-foundation/wicket-foundation-samples/pom.xml b/wicket-foundation/wicket-foundation-samples/pom.xml index 34b077d8d8..53f3026e61 100644 --- a/wicket-foundation/wicket-foundation-samples/pom.xml +++ b/wicket-foundation/wicket-foundation-samples/pom.xml @@ -7,7 +7,7 @@ wicket-foundation-parent org.wicketstuff.foundation - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-foundation-samples diff --git a/wicket-html5-parent/pom.xml b/wicket-html5-parent/pom.xml index 78bf184d2f..13f7c2bed0 100644 --- a/wicket-html5-parent/pom.xml +++ b/wicket-html5-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-html5-parent diff --git a/wicket-html5-parent/wicket-html5-examples/pom.xml b/wicket-html5-parent/wicket-html5-examples/pom.xml index 24e081927f..71e25af974 100644 --- a/wicket-html5-parent/wicket-html5-examples/pom.xml +++ b/wicket-html5-parent/wicket-html5-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-html5-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-html5-examples diff --git a/wicket-html5-parent/wicket-html5/pom.xml b/wicket-html5-parent/wicket-html5/pom.xml index 5a6a082861..4f5f597bf0 100644 --- a/wicket-html5-parent/wicket-html5/pom.xml +++ b/wicket-html5-parent/wicket-html5/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-html5-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-html5 diff --git a/wicket-mount-parent/pom.xml b/wicket-mount-parent/pom.xml index 3e8ea5547d..b00b52c89e 100644 --- a/wicket-mount-parent/pom.xml +++ b/wicket-mount-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-mount-parent diff --git a/wicket-mount-parent/wicket-mount-core/pom.xml b/wicket-mount-parent/wicket-mount-core/pom.xml index f17634ece2..8101921ae8 100644 --- a/wicket-mount-parent/wicket-mount-core/pom.xml +++ b/wicket-mount-parent/wicket-mount-core/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-mount-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/wicket-mount-parent/wicket-mount-example/pom.xml b/wicket-mount-parent/wicket-mount-example/pom.xml index 9bb94e06f2..6b903965c6 100644 --- a/wicket-mount-parent/wicket-mount-example/pom.xml +++ b/wicket-mount-parent/wicket-mount-example/pom.xml @@ -5,7 +5,7 @@ wicket-mount-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT org.wicketstuff diff --git a/wicket-mount-parent/wicket-mount/pom.xml b/wicket-mount-parent/wicket-mount/pom.xml index 175f34cc2b..ca9481c1c5 100644 --- a/wicket-mount-parent/wicket-mount/pom.xml +++ b/wicket-mount-parent/wicket-mount/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-mount-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 wicket-mount diff --git a/wicket-osgi-parent/pom.xml b/wicket-osgi-parent/pom.xml index d011fae003..1def23abe6 100644 --- a/wicket-osgi-parent/pom.xml +++ b/wicket-osgi-parent/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-osgi-parent Wicket OSGi Parent diff --git a/wicket-osgi-parent/wicket-osgi-test-service/pom.xml b/wicket-osgi-parent/wicket-osgi-test-service/pom.xml index 29fb9d1a61..6bf2fa87e4 100644 --- a/wicket-osgi-parent/wicket-osgi-test-service/pom.xml +++ b/wicket-osgi-parent/wicket-osgi-test-service/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-osgi-test-service bundle diff --git a/wicket-osgi-parent/wicket-osgi-test-web/pom.xml b/wicket-osgi-parent/wicket-osgi-test-web/pom.xml index d77f07cb52..6bef563dcd 100644 --- a/wicket-osgi-parent/wicket-osgi-test-web/pom.xml +++ b/wicket-osgi-parent/wicket-osgi-test-web/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-osgi-test-web bundle diff --git a/wicket-osgi-parent/wicket-osgi/pom.xml b/wicket-osgi-parent/wicket-osgi/pom.xml index a7e60ba4ed..b6ac8dabce 100644 --- a/wicket-osgi-parent/wicket-osgi/pom.xml +++ b/wicket-osgi-parent/wicket-osgi/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-osgi bundle diff --git a/wicket-poi-parent/pom.xml b/wicket-poi-parent/pom.xml index 16543c633b..c0f431a43e 100644 --- a/wicket-poi-parent/pom.xml +++ b/wicket-poi-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-poi-parent diff --git a/wicket-poi-parent/wicket-poi-examples/pom.xml b/wicket-poi-parent/wicket-poi-examples/pom.xml index f9fc9dd403..3f4a849e59 100644 --- a/wicket-poi-parent/wicket-poi-examples/pom.xml +++ b/wicket-poi-parent/wicket-poi-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-poi-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-poi-examples diff --git a/wicket-poi-parent/wicket-poi/pom.xml b/wicket-poi-parent/wicket-poi/pom.xml index 4af7efc915..b77e1f6dce 100644 --- a/wicket-poi-parent/wicket-poi/pom.xml +++ b/wicket-poi-parent/wicket-poi/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-poi-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-poi diff --git a/wicket-security-parent/pom.xml b/wicket-security-parent/pom.xml index 3a960f8164..d38b958c5e 100644 --- a/wicket-security-parent/pom.xml +++ b/wicket-security-parent/pom.xml @@ -19,7 +19,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 wicket-security-parent diff --git a/wicket-security-parent/swarm-parent/hive/pom.xml b/wicket-security-parent/swarm-parent/hive/pom.xml index 333ad3e0f5..352fa3d0af 100644 --- a/wicket-security-parent/swarm-parent/hive/pom.xml +++ b/wicket-security-parent/swarm-parent/hive/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-swarm-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-security-hive jar diff --git a/wicket-security-parent/swarm-parent/pom.xml b/wicket-security-parent/swarm-parent/pom.xml index 5a987ec9f7..d8fc2b7b23 100644 --- a/wicket-security-parent/swarm-parent/pom.xml +++ b/wicket-security-parent/swarm-parent/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-security-swarm-parent pom diff --git a/wicket-security-parent/swarm-parent/swarm/pom.xml b/wicket-security-parent/swarm-parent/swarm/pom.xml index f3cd2ff213..068143c942 100644 --- a/wicket-security-parent/swarm-parent/swarm/pom.xml +++ b/wicket-security-parent/swarm-parent/swarm/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-swarm-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-security-swarm jar diff --git a/wicket-security-parent/wasp-parent/pom.xml b/wicket-security-parent/wasp-parent/pom.xml index 3a174a64c4..8ff46b09a9 100644 --- a/wicket-security-parent/wasp-parent/pom.xml +++ b/wicket-security-parent/wasp-parent/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicket-security-wasp-parent pom diff --git a/wicket-security-parent/wasp-parent/wasp/pom.xml b/wicket-security-parent/wasp-parent/wasp/pom.xml index eee302bf22..6ccf67a6a2 100644 --- a/wicket-security-parent/wasp-parent/wasp/pom.xml +++ b/wicket-security-parent/wasp-parent/wasp/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-wasp-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-security-wasp jar diff --git a/wicket-security-parent/wasp-parent/wicomsec/pom.xml b/wicket-security-parent/wasp-parent/wicomsec/pom.xml index cf44a59edb..773ad18c47 100644 --- a/wicket-security-parent/wasp-parent/wicomsec/pom.xml +++ b/wicket-security-parent/wasp-parent/wicomsec/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-wasp-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-security-wicomsec jar diff --git a/wicket-servlet3-parent/pom.xml b/wicket-servlet3-parent/pom.xml index f52cbf9737..c3c2478007 100644 --- a/wicket-servlet3-parent/pom.xml +++ b/wicket-servlet3-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-servlet3-parent diff --git a/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml b/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml index 441f0e48e3..f9a8b332b9 100644 --- a/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml +++ b/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-servlet3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-servlet3-auth diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml index 91aa331a60..25750576dd 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml +++ b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-servlet3-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-servlet3-examples diff --git a/wicketstuff-glassfish4-integration/pom.xml b/wicketstuff-glassfish4-integration/pom.xml index 02786e08ab..90acbf7194 100644 --- a/wicketstuff-glassfish4-integration/pom.xml +++ b/wicketstuff-glassfish4-integration/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-glassfish4-integration jar diff --git a/wicketstuff-lazymodel/pom.xml b/wicketstuff-lazymodel/pom.xml index 8efff58efe..a5e3e6e891 100644 --- a/wicketstuff-lazymodel/pom.xml +++ b/wicketstuff-lazymodel/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-lazymodel diff --git a/wicketstuff-logback-parent/pom.xml b/wicketstuff-logback-parent/pom.xml index ca46146241..951156cd75 100644 --- a/wicketstuff-logback-parent/pom.xml +++ b/wicketstuff-logback-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-logback-parent diff --git a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml index 7150b73ba1..3235f3f151 100644 --- a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml +++ b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-logback-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-logback-examples diff --git a/wicketstuff-logback-parent/wicketstuff-logback/pom.xml b/wicketstuff-logback-parent/wicketstuff-logback/pom.xml index 8f30e23869..a89214d8ac 100644 --- a/wicketstuff-logback-parent/wicketstuff-logback/pom.xml +++ b/wicketstuff-logback-parent/wicketstuff-logback/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-logback-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-logback diff --git a/wicketstuff-restannotations-parent/pom.xml b/wicketstuff-restannotations-parent/pom.xml index 528d908c24..997e6c67ba 100644 --- a/wicketstuff-restannotations-parent/pom.xml +++ b/wicketstuff-restannotations-parent/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-restannotations-parent diff --git a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml index e8ac888742..8b819d8c75 100644 --- a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT org.wicketstuff diff --git a/wicketstuff-restannotations-parent/restannotations-json/pom.xml b/wicketstuff-restannotations-parent/restannotations-json/pom.xml index fa54bf79eb..f4367480eb 100644 --- a/wicketstuff-restannotations-parent/restannotations-json/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations-json/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-restannotations-json diff --git a/wicketstuff-restannotations-parent/restannotations/pom.xml b/wicketstuff-restannotations-parent/restannotations/pom.xml index aef50bca28..9108be7348 100644 --- a/wicketstuff-restannotations-parent/restannotations/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-restannotations diff --git a/wicketstuff-selectize-parent/pom.xml b/wicketstuff-selectize-parent/pom.xml index 5137ad79cc..2fa5cdc519 100644 --- a/wicketstuff-selectize-parent/pom.xml +++ b/wicketstuff-selectize-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-selectize-parent diff --git a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml index 425f919804..698ea837dd 100644 --- a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml +++ b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-selectize-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-selectize-examples diff --git a/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml b/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml index 3ad11fcd7a..add23ecf71 100644 --- a/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml +++ b/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-selectize-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-selectize diff --git a/wicketstuff-springreference-parent/pom.xml b/wicketstuff-springreference-parent/pom.xml index 334a7011d4..40c5566549 100644 --- a/wicketstuff-springreference-parent/pom.xml +++ b/wicketstuff-springreference-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-springreference-parent diff --git a/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml b/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml index b2a76ea648..afa5a9baef 100644 --- a/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml +++ b/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-springreference-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-springreference-examples diff --git a/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml b/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml index 4379957aa9..2f80c0396f 100644 --- a/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml +++ b/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-springreference-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-springreference diff --git a/yui-parent/pom.xml b/yui-parent/pom.xml index 771a311b8e..a420c18261 100644 --- a/yui-parent/pom.xml +++ b/yui-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT wicketstuff-yui-parent diff --git a/yui-parent/yui-calendar/pom.xml b/yui-parent/yui-calendar/pom.xml index cd681e5f64..81b1720399 100644 --- a/yui-parent/yui-calendar/pom.xml +++ b/yui-parent/yui-calendar/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-yui-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 diff --git a/yui-parent/yui-common/pom.xml b/yui-parent/yui-common/pom.xml index cee864f0f0..e0954cc241 100644 --- a/yui-parent/yui-common/pom.xml +++ b/yui-parent/yui-common/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-yui-parent - 7.4.0-SNAPSHOT + 7.5.0-SNAPSHOT 4.0.0 From c41dbbad469897bdc316789f59184690cf42a160 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 31 Aug 2016 14:39:40 +0200 Subject: [PATCH 015/139] Set the version back to 7.0-SNAPSHOT, as it was few months ago --- annotation/pom.xml | 2 +- .../annotationeventdispatcher/pom.xml | 2 +- annotationeventdispatcher-parent/pom.xml | 2 +- async-tasks-parent/async-tasks-demo/pom.xml | 2 +- async-tasks-parent/async-tasks-impl/pom.xml | 2 +- async-tasks-parent/pom.xml | 2 +- autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml | 2 +- autocomplete-tagit-parent/autocomplete-tagit/pom.xml | 2 +- autocomplete-tagit-parent/pom.xml | 2 +- browserid-parent/browserid-examples/pom.xml | 2 +- browserid-parent/browserid/pom.xml | 2 +- browserid-parent/pom.xml | 2 +- closure-compiler/pom.xml | 2 +- dashboard-parent/dashboard-core/pom.xml | 2 +- dashboard-parent/dashboard-examples/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-charts/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-jqplot/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-justgage/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-loremipsum/pom.xml | 2 +- .../dashboard-widgets/dashboard-widgets-ofchart/pom.xml | 2 +- dashboard-parent/dashboard-widgets/pom.xml | 2 +- dashboard-parent/pom.xml | 2 +- datastores-parent/datastore-cassandra/pom.xml | 2 +- datastores-parent/datastore-common/pom.xml | 2 +- datastores-parent/datastore-hazelcast/pom.xml | 2 +- datastores-parent/datastore-ignite/pom.xml | 2 +- datastores-parent/datastore-memcached/pom.xml | 2 +- datastores-parent/datastore-redis/pom.xml | 2 +- datastores-parent/pom.xml | 2 +- datatables-parent/datatables-examples/pom.xml | 2 +- datatables-parent/datatables/pom.xml | 2 +- datatables-parent/pom.xml | 2 +- editable-grid-parent/editable-grid-examples/pom.xml | 2 +- editable-grid-parent/editable-grid/pom.xml | 2 +- editable-grid-parent/pom.xml | 2 +- flot-parent/flot-examples/pom.xml | 2 +- flot-parent/flot/pom.xml | 2 +- flot-parent/pom.xml | 2 +- gae-initializer-parent/gae-initializer-example/pom.xml | 2 +- gae-initializer-parent/gae-initializer/pom.xml | 2 +- gae-initializer-parent/pom.xml | 2 +- gmap3-parent/gmap3-examples/pom.xml | 2 +- gmap3-parent/gmap3/pom.xml | 2 +- gmap3-parent/pom.xml | 2 +- googlecharts-parent/googlecharts-examples/pom.xml | 2 +- googlecharts-parent/googlecharts/pom.xml | 2 +- googlecharts-parent/pom.xml | 2 +- htmlcompressor-parent/htmlcompressor-examples/pom.xml | 2 +- htmlcompressor-parent/htmlcompressor/pom.xml | 2 +- htmlcompressor-parent/pom.xml | 2 +- inmethod-grid-parent/inmethod-grid-examples/pom.xml | 2 +- inmethod-grid-parent/inmethod-grid/pom.xml | 2 +- inmethod-grid-parent/pom.xml | 2 +- input-events-parent/input-events-examples/pom.xml | 2 +- input-events-parent/input-events/pom.xml | 2 +- input-events-parent/pom.xml | 2 +- jamon-parent/jamon-examples/pom.xml | 2 +- jamon-parent/jamon/pom.xml | 2 +- jamon-parent/pom.xml | 2 +- jasperreports-parent/jasperreports-examples/pom.xml | 2 +- jasperreports-parent/jasperreports/pom.xml | 2 +- jasperreports-parent/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-ear/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-ejb/pom.xml | 2 +- .../javaee-inject-examples/javaee-inject-example-war/pom.xml | 2 +- javaee-inject-parent/javaee-inject-examples/pom.xml | 2 +- javaee-inject-parent/javaee-inject/pom.xml | 2 +- javaee-inject-parent/pom.xml | 2 +- jee-web-parent/jee-web-examples/pom.xml | 2 +- jee-web-parent/jee-web/pom.xml | 2 +- jee-web-parent/pom.xml | 2 +- jqplot-parent/jqplot-examples/pom.xml | 2 +- jqplot-parent/jqplot/pom.xml | 2 +- jqplot-parent/pom.xml | 2 +- jquery-parent/jquery-examples/pom.xml | 2 +- jquery-parent/jquery/pom.xml | 2 +- jquery-parent/pom.xml | 2 +- jwicket-parent/dropdown-menu/pom.xml | 2 +- jwicket-parent/jwicket-core/pom.xml | 2 +- jwicket-parent/jwicket-examples/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml | 2 +- .../jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml | 2 +- jwicket-parent/jwicket-tooltip/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml | 2 +- jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml | 2 +- jwicket-parent/jwicket-ui/pom.xml | 2 +- jwicket-parent/pom.xml | 2 +- lambda-parent/lambda-examples/pom.xml | 2 +- lambda-parent/lambda/pom.xml | 2 +- lambda-parent/pom.xml | 2 +- lightbox2-parent/lightbox2-examples/pom.xml | 2 +- lightbox2-parent/lightbox2/pom.xml | 2 +- lightbox2-parent/pom.xml | 2 +- mbeanview-parent/mbeanview-examples/pom.xml | 2 +- mbeanview-parent/mbeanview/pom.xml | 2 +- mbeanview-parent/pom.xml | 2 +- minis-parent/minis-examples/pom.xml | 2 +- minis-parent/minis/pom.xml | 2 +- minis-parent/pom.xml | 2 +- modalx-parent/modalx-examples/pom.xml | 2 +- modalx-parent/modalx/pom.xml | 2 +- modalx-parent/pom.xml | 2 +- nashorn-parent/nashorn-examples/pom.xml | 2 +- nashorn-parent/nashorn/pom.xml | 2 +- nashorn-parent/pom.xml | 2 +- objectautocomplete-parent/objectautocomplete-examples/pom.xml | 2 +- objectautocomplete-parent/objectautocomplete/pom.xml | 2 +- objectautocomplete-parent/pom.xml | 2 +- offline-mode-parent/offline-mode-examples/pom.xml | 2 +- offline-mode-parent/offline-mode/pom.xml | 2 +- offline-mode-parent/pom.xml | 2 +- openlayers-parent/openlayers-examples/pom.xml | 2 +- openlayers-parent/openlayers-proxy/pom.xml | 2 +- openlayers-parent/openlayers/pom.xml | 2 +- openlayers-parent/pom.xml | 2 +- openlayers3-parent/openlayers3-bootstrap/pom.xml | 2 +- openlayers3-parent/openlayers3-examples/pom.xml | 2 +- openlayers3-parent/openlayers3/pom.xml | 2 +- openlayers3-parent/pom.xml | 2 +- phonebook/pom.xml | 2 +- plugin/pom.xml | 2 +- pom.xml | 2 +- portlet-parent/pom.xml | 2 +- portlet-parent/wicketstuff-portlet-examples/pom.xml | 2 +- portlet-parent/wicketstuff-portlet/pom.xml | 2 +- progressbar-parent/pom.xml | 2 +- progressbar-parent/progressbar-example/pom.xml | 2 +- progressbar-parent/progressbar-spring/pom.xml | 2 +- progressbar-parent/progressbar/pom.xml | 2 +- push-parent/pom.xml | 2 +- push-parent/push-cometd/pom.xml | 2 +- push-parent/push-core/pom.xml | 2 +- push-parent/push-examples/pom.xml | 2 +- push-parent/push-timer/pom.xml | 2 +- scala-extensions-parent/pom.xml | 2 +- scala-extensions-parent/wicket-scala-archetype/pom.xml | 2 +- scala-extensions-parent/wicket-scala-sample/pom.xml | 2 +- scala-extensions-parent/wicket-scala/pom.xml | 2 +- select2-parent/pom.xml | 2 +- select2-parent/select2-examples/pom.xml | 2 +- select2-parent/select2/pom.xml | 2 +- serializer-common/pom.xml | 2 +- serializer-fast/pom.xml | 2 +- serializer-fast2/pom.xml | 2 +- serializer-kryo/pom.xml | 2 +- serializer-kryo2/pom.xml | 2 +- serializer-ui/pom.xml | 2 +- shiro-security/pom.xml | 2 +- shiro-security/wicket-shiro-examples/pom.xml | 2 +- shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml | 2 +- .../wicket-shiro-examples/shiro-example-realm/pom.xml | 2 +- .../shiro-example-spring-hibernate-native/pom.xml | 2 +- .../shiro-example-spring-hibernate/pom.xml | 2 +- .../wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml | 2 +- shiro-security/wicket-shiro/pom.xml | 2 +- simile-timeline-parent/pom.xml | 2 +- simile-timeline-parent/simile-timeline/pom.xml | 2 +- sitemap-xml-parent/pom.xml | 2 +- sitemap-xml-parent/sitemap-xml-examples/pom.xml | 2 +- sitemap-xml-parent/sitemap-xml/pom.xml | 2 +- stateless-parent/pom.xml | 2 +- stateless-parent/stateless-examples/pom.xml | 2 +- stateless-parent/stateless/pom.xml | 2 +- tinymce3-parent/pom.xml | 2 +- tinymce3-parent/tinymce3-examples/pom.xml | 2 +- tinymce3-parent/tinymce3/pom.xml | 2 +- tinymce4-parent/pom.xml | 2 +- tinymce4-parent/tinymce4-examples/pom.xml | 2 +- tinymce4-parent/tinymce4/pom.xml | 2 +- twitter-parent/pom.xml | 2 +- twitter-parent/twitter-examples/pom.xml | 2 +- twitter-parent/twitter/pom.xml | 2 +- urlfragment-parent/pom.xml | 2 +- urlfragment-parent/urlfragment-example/pom.xml | 2 +- urlfragment-parent/urlfragment/pom.xml | 2 +- whiteboard-parent/pom.xml | 2 +- whiteboard-parent/whiteboard-examples/pom.xml | 2 +- whiteboard-parent/whiteboard/pom.xml | 2 +- wicket-bundle-parent/pom.xml | 2 +- wicket-bundle-parent/wicket-bundle/pom.xml | 2 +- wicket-bundle-parent/wicket-ioc-bundle/pom.xml | 2 +- wicket-facebook-parent/pom.xml | 2 +- wicket-facebook-parent/wicket-facebook-examples/pom.xml | 2 +- wicket-facebook-parent/wicket-facebook/pom.xml | 2 +- wicket-foundation/pom.xml | 2 +- wicket-foundation/wicket-foundation-core/pom.xml | 2 +- wicket-foundation/wicket-foundation-samples/pom.xml | 2 +- wicket-html5-parent/pom.xml | 2 +- wicket-html5-parent/wicket-html5-examples/pom.xml | 2 +- wicket-html5-parent/wicket-html5/pom.xml | 2 +- wicket-mount-parent/pom.xml | 2 +- wicket-mount-parent/wicket-mount-core/pom.xml | 2 +- wicket-mount-parent/wicket-mount-example/pom.xml | 2 +- wicket-mount-parent/wicket-mount/pom.xml | 2 +- wicket-osgi-parent/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi-test-service/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi-test-web/pom.xml | 2 +- wicket-osgi-parent/wicket-osgi/pom.xml | 2 +- wicket-poi-parent/pom.xml | 2 +- wicket-poi-parent/wicket-poi-examples/pom.xml | 2 +- wicket-poi-parent/wicket-poi/pom.xml | 2 +- wicket-security-parent/pom.xml | 2 +- wicket-security-parent/swarm-parent/hive/pom.xml | 2 +- wicket-security-parent/swarm-parent/pom.xml | 2 +- wicket-security-parent/swarm-parent/swarm/pom.xml | 2 +- wicket-security-parent/wasp-parent/pom.xml | 2 +- wicket-security-parent/wasp-parent/wasp/pom.xml | 2 +- wicket-security-parent/wasp-parent/wicomsec/pom.xml | 2 +- wicket-servlet3-parent/pom.xml | 2 +- wicket-servlet3-parent/wicket-servlet3-auth/pom.xml | 2 +- wicket-servlet3-parent/wicket-servlet3-examples/pom.xml | 2 +- wicketstuff-glassfish4-integration/pom.xml | 2 +- wicketstuff-lazymodel/pom.xml | 2 +- wicketstuff-logback-parent/pom.xml | 2 +- wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml | 2 +- wicketstuff-logback-parent/wicketstuff-logback/pom.xml | 2 +- wicketstuff-restannotations-parent/pom.xml | 2 +- .../restannotations-examples/pom.xml | 2 +- wicketstuff-restannotations-parent/restannotations-json/pom.xml | 2 +- wicketstuff-restannotations-parent/restannotations/pom.xml | 2 +- wicketstuff-selectize-parent/pom.xml | 2 +- .../wicketstuff-selectize-examples/pom.xml | 2 +- wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml | 2 +- wicketstuff-springreference-parent/pom.xml | 2 +- .../wicketstuff-springreference-examples/pom.xml | 2 +- .../wicketstuff-springreference/pom.xml | 2 +- yui-parent/pom.xml | 2 +- yui-parent/yui-calendar/pom.xml | 2 +- yui-parent/yui-common/pom.xml | 2 +- 235 files changed, 235 insertions(+), 235 deletions(-) diff --git a/annotation/pom.xml b/annotation/pom.xml index 99b3cde3a0..714604acc0 100644 --- a/annotation/pom.xml +++ b/annotation/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-annotation diff --git a/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml b/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml index 44236c2d92..e920f1c75d 100644 --- a/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml +++ b/annotationeventdispatcher-parent/annotationeventdispatcher/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-annotationeventdispatcher-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-annotationeventdispatcher diff --git a/annotationeventdispatcher-parent/pom.xml b/annotationeventdispatcher-parent/pom.xml index 9fae0cbfb1..d6336b6dea 100644 --- a/annotationeventdispatcher-parent/pom.xml +++ b/annotationeventdispatcher-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-annotationeventdispatcher-parent Annotation Event Dispatcher - Parent diff --git a/async-tasks-parent/async-tasks-demo/pom.xml b/async-tasks-parent/async-tasks-demo/pom.xml index af6a0413f8..c6b9e22ab9 100644 --- a/async-tasks-parent/async-tasks-demo/pom.xml +++ b/async-tasks-parent/async-tasks-demo/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff async-tasks-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT async-task-demo diff --git a/async-tasks-parent/async-tasks-impl/pom.xml b/async-tasks-parent/async-tasks-impl/pom.xml index be52e107e9..0435db2421 100644 --- a/async-tasks-parent/async-tasks-impl/pom.xml +++ b/async-tasks-parent/async-tasks-impl/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff async-tasks-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT async-task-impl diff --git a/async-tasks-parent/pom.xml b/async-tasks-parent/pom.xml index 40f81b8396..4d3c6773dc 100644 --- a/async-tasks-parent/pom.xml +++ b/async-tasks-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT async-tasks-parent diff --git a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml index 2a8e0de73d..92c309cdbc 100644 --- a/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml +++ b/autocomplete-tagit-parent/autocomplete-tagit-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-autocomplete-tagit-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-autocomplete-tagit-examples diff --git a/autocomplete-tagit-parent/autocomplete-tagit/pom.xml b/autocomplete-tagit-parent/autocomplete-tagit/pom.xml index 733df606c3..38bed95bcc 100644 --- a/autocomplete-tagit-parent/autocomplete-tagit/pom.xml +++ b/autocomplete-tagit-parent/autocomplete-tagit/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-autocomplete-tagit-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-autocomplete-tagit diff --git a/autocomplete-tagit-parent/pom.xml b/autocomplete-tagit-parent/pom.xml index 52c823eb4a..6fe0cff523 100644 --- a/autocomplete-tagit-parent/pom.xml +++ b/autocomplete-tagit-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-autocomplete-tagit-parent Autocomplete Tag It Parent diff --git a/browserid-parent/browserid-examples/pom.xml b/browserid-parent/browserid-examples/pom.xml index d7fae50fc6..b9fe848476 100644 --- a/browserid-parent/browserid-examples/pom.xml +++ b/browserid-parent/browserid-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-browserid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-browserid-examples diff --git a/browserid-parent/browserid/pom.xml b/browserid-parent/browserid/pom.xml index 070fe55e96..e106d9c84a 100644 --- a/browserid-parent/browserid/pom.xml +++ b/browserid-parent/browserid/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-browserid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-browserid diff --git a/browserid-parent/pom.xml b/browserid-parent/pom.xml index 4ddb5c9790..6dd0a1083b 100644 --- a/browserid-parent/pom.xml +++ b/browserid-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-browserid-parent BrowserId Parent diff --git a/closure-compiler/pom.xml b/closure-compiler/pom.xml index c8c16bd2a3..f3998abcf1 100644 --- a/closure-compiler/pom.xml +++ b/closure-compiler/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-closure-compiler diff --git a/dashboard-parent/dashboard-core/pom.xml b/dashboard-parent/dashboard-core/pom.xml index 6bd02625c9..abc1773142 100644 --- a/dashboard-parent/dashboard-core/pom.xml +++ b/dashboard-parent/dashboard-core/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-core diff --git a/dashboard-parent/dashboard-examples/pom.xml b/dashboard-parent/dashboard-examples/pom.xml index 45e96cd1a1..d12c4fc252 100644 --- a/dashboard-parent/dashboard-examples/pom.xml +++ b/dashboard-parent/dashboard-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-examples diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml index 613d087a28..0a1b0215bf 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-charts/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets-charts diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml index 7299cb2cfa..c37f7a504c 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-jqplot/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets-jqplot diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml index 03e8972c01..3a51116ac1 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-justgage/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets-justgage diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml index 97794fe0ee..2c2b88a079 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-loremipsum/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets-loremipsum diff --git a/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml b/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml index 503a6724ff..fb560f6cf9 100644 --- a/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml +++ b/dashboard-parent/dashboard-widgets/dashboard-widgets-ofchart/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-widgets - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets-ofchart diff --git a/dashboard-parent/dashboard-widgets/pom.xml b/dashboard-parent/dashboard-widgets/pom.xml index 7d41b92897..b03559416a 100644 --- a/dashboard-parent/dashboard-widgets/pom.xml +++ b/dashboard-parent/dashboard-widgets/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-dashboard-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-widgets diff --git a/dashboard-parent/pom.xml b/dashboard-parent/pom.xml index 05bdcdbc4a..bc0d3d4f7e 100644 --- a/dashboard-parent/pom.xml +++ b/dashboard-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-dashboard-parent diff --git a/datastores-parent/datastore-cassandra/pom.xml b/datastores-parent/datastore-cassandra/pom.xml index fafac91600..fc0408b5c1 100644 --- a/datastores-parent/datastore-cassandra/pom.xml +++ b/datastores-parent/datastore-cassandra/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-common/pom.xml b/datastores-parent/datastore-common/pom.xml index 20f815de96..c93d1a280e 100644 --- a/datastores-parent/datastore-common/pom.xml +++ b/datastores-parent/datastore-common/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-hazelcast/pom.xml b/datastores-parent/datastore-hazelcast/pom.xml index 1094b90c69..de32a4ad7d 100644 --- a/datastores-parent/datastore-hazelcast/pom.xml +++ b/datastores-parent/datastore-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-ignite/pom.xml b/datastores-parent/datastore-ignite/pom.xml index dc5861b94a..b0c64f6171 100644 --- a/datastores-parent/datastore-ignite/pom.xml +++ b/datastores-parent/datastore-ignite/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-memcached/pom.xml b/datastores-parent/datastore-memcached/pom.xml index 0e89938200..13f7326d90 100644 --- a/datastores-parent/datastore-memcached/pom.xml +++ b/datastores-parent/datastore-memcached/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/datastore-redis/pom.xml b/datastores-parent/datastore-redis/pom.xml index 75c7096b61..a4f24d78a6 100644 --- a/datastores-parent/datastore-redis/pom.xml +++ b/datastores-parent/datastore-redis/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff datastores-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/datastores-parent/pom.xml b/datastores-parent/pom.xml index cb65fcf7db..62de508f3f 100644 --- a/datastores-parent/pom.xml +++ b/datastores-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT datastores-parent diff --git a/datatables-parent/datatables-examples/pom.xml b/datatables-parent/datatables-examples/pom.xml index eb57f0c1c4..8931e9f1f8 100644 --- a/datatables-parent/datatables-examples/pom.xml +++ b/datatables-parent/datatables-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff datatables-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT datatables-examples diff --git a/datatables-parent/datatables/pom.xml b/datatables-parent/datatables/pom.xml index 7087c795ad..60826c29ad 100755 --- a/datatables-parent/datatables/pom.xml +++ b/datatables-parent/datatables/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff datatables-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-datatables diff --git a/datatables-parent/pom.xml b/datatables-parent/pom.xml index a7ae6f7a54..0a0f836c67 100644 --- a/datatables-parent/pom.xml +++ b/datatables-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT datatables-parent diff --git a/editable-grid-parent/editable-grid-examples/pom.xml b/editable-grid-parent/editable-grid-examples/pom.xml index 9f05d07866..fcf266e20f 100644 --- a/editable-grid-parent/editable-grid-examples/pom.xml +++ b/editable-grid-parent/editable-grid-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff editable-grid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT editable-grid-examples war diff --git a/editable-grid-parent/editable-grid/pom.xml b/editable-grid-parent/editable-grid/pom.xml index 59fd2e3417..7ffaff0598 100644 --- a/editable-grid-parent/editable-grid/pom.xml +++ b/editable-grid-parent/editable-grid/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff editable-grid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-editable-grid Editable Grid component for Apache Wicket diff --git a/editable-grid-parent/pom.xml b/editable-grid-parent/pom.xml index 043c3bc232..dfe41a6fef 100644 --- a/editable-grid-parent/pom.xml +++ b/editable-grid-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT editable-grid-parent diff --git a/flot-parent/flot-examples/pom.xml b/flot-parent/flot-examples/pom.xml index 8a0118cece..8d2b29fee0 100644 --- a/flot-parent/flot-examples/pom.xml +++ b/flot-parent/flot-examples/pom.xml @@ -6,7 +6,7 @@ flot-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT flot-examples diff --git a/flot-parent/flot/pom.xml b/flot-parent/flot/pom.xml index 467856b37a..20d35ce00d 100644 --- a/flot-parent/flot/pom.xml +++ b/flot-parent/flot/pom.xml @@ -6,7 +6,7 @@ flot-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-flot diff --git a/flot-parent/pom.xml b/flot-parent/pom.xml index 336b1c5608..1e50e4bafd 100644 --- a/flot-parent/pom.xml +++ b/flot-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT flot-parent diff --git a/gae-initializer-parent/gae-initializer-example/pom.xml b/gae-initializer-parent/gae-initializer-example/pom.xml index 57171ec720..e992555055 100644 --- a/gae-initializer-parent/gae-initializer-example/pom.xml +++ b/gae-initializer-parent/gae-initializer-example/pom.xml @@ -6,7 +6,7 @@ gae-initializer-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT gae-initializer-example diff --git a/gae-initializer-parent/gae-initializer/pom.xml b/gae-initializer-parent/gae-initializer/pom.xml index 172d110da6..7e32ffc0dd 100644 --- a/gae-initializer-parent/gae-initializer/pom.xml +++ b/gae-initializer-parent/gae-initializer/pom.xml @@ -6,7 +6,7 @@ gae-initializer-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-gae-initializer diff --git a/gae-initializer-parent/pom.xml b/gae-initializer-parent/pom.xml index 601606704f..c54b631a96 100644 --- a/gae-initializer-parent/pom.xml +++ b/gae-initializer-parent/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT gae-initializer-parent diff --git a/gmap3-parent/gmap3-examples/pom.xml b/gmap3-parent/gmap3-examples/pom.xml index 164187dba5..d5f2b3768c 100644 --- a/gmap3-parent/gmap3-examples/pom.xml +++ b/gmap3-parent/gmap3-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff gmap3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-gmap3-examples diff --git a/gmap3-parent/gmap3/pom.xml b/gmap3-parent/gmap3/pom.xml index 73202754f8..115ded4894 100644 --- a/gmap3-parent/gmap3/pom.xml +++ b/gmap3-parent/gmap3/pom.xml @@ -21,7 +21,7 @@ limitations under the License. org.wicketstuff gmap3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-gmap3 diff --git a/gmap3-parent/pom.xml b/gmap3-parent/pom.xml index 2bffab2325..e33329bde1 100644 --- a/gmap3-parent/pom.xml +++ b/gmap3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT gmap3-parent diff --git a/googlecharts-parent/googlecharts-examples/pom.xml b/googlecharts-parent/googlecharts-examples/pom.xml index 30917add87..49b5d1b885 100644 --- a/googlecharts-parent/googlecharts-examples/pom.xml +++ b/googlecharts-parent/googlecharts-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff googlecharts-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT googlecharts-examples diff --git a/googlecharts-parent/googlecharts/pom.xml b/googlecharts-parent/googlecharts/pom.xml index 764b0a5cab..0c3175e732 100644 --- a/googlecharts-parent/googlecharts/pom.xml +++ b/googlecharts-parent/googlecharts/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff googlecharts-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-googlecharts jar diff --git a/googlecharts-parent/pom.xml b/googlecharts-parent/pom.xml index 25398f2c56..39bb6c4699 100644 --- a/googlecharts-parent/pom.xml +++ b/googlecharts-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT googlecharts-parent diff --git a/htmlcompressor-parent/htmlcompressor-examples/pom.xml b/htmlcompressor-parent/htmlcompressor-examples/pom.xml index 7a33989d37..f490c390f9 100644 --- a/htmlcompressor-parent/htmlcompressor-examples/pom.xml +++ b/htmlcompressor-parent/htmlcompressor-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-htmlcompressor-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-htmlcompressor-examples diff --git a/htmlcompressor-parent/htmlcompressor/pom.xml b/htmlcompressor-parent/htmlcompressor/pom.xml index eee703bfcb..fa13d9811e 100644 --- a/htmlcompressor-parent/htmlcompressor/pom.xml +++ b/htmlcompressor-parent/htmlcompressor/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-htmlcompressor-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-htmlcompressor diff --git a/htmlcompressor-parent/pom.xml b/htmlcompressor-parent/pom.xml index 4373cabd16..b915674cc2 100644 --- a/htmlcompressor-parent/pom.xml +++ b/htmlcompressor-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-htmlcompressor-parent diff --git a/inmethod-grid-parent/inmethod-grid-examples/pom.xml b/inmethod-grid-parent/inmethod-grid-examples/pom.xml index c6e2b14799..e2015c4f3b 100644 --- a/inmethod-grid-parent/inmethod-grid-examples/pom.xml +++ b/inmethod-grid-parent/inmethod-grid-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff inmethod-grid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-inmethod-grid-examples diff --git a/inmethod-grid-parent/inmethod-grid/pom.xml b/inmethod-grid-parent/inmethod-grid/pom.xml index 20d2adf336..fdbaf1ace7 100644 --- a/inmethod-grid-parent/inmethod-grid/pom.xml +++ b/inmethod-grid-parent/inmethod-grid/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff inmethod-grid-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-inmethod-grid diff --git a/inmethod-grid-parent/pom.xml b/inmethod-grid-parent/pom.xml index dbd8606a6f..9e29f99c33 100644 --- a/inmethod-grid-parent/pom.xml +++ b/inmethod-grid-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT inmethod-grid-parent diff --git a/input-events-parent/input-events-examples/pom.xml b/input-events-parent/input-events-examples/pom.xml index d88f2881d1..dac99ed1f1 100644 --- a/input-events-parent/input-events-examples/pom.xml +++ b/input-events-parent/input-events-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff input-events-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT input-events-examples diff --git a/input-events-parent/input-events/pom.xml b/input-events-parent/input-events/pom.xml index 391832cf0a..5f55814ed4 100644 --- a/input-events-parent/input-events/pom.xml +++ b/input-events-parent/input-events/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff input-events-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-input-events diff --git a/input-events-parent/pom.xml b/input-events-parent/pom.xml index 5f4f664805..aadf914ecc 100644 --- a/input-events-parent/pom.xml +++ b/input-events-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT input-events-parent diff --git a/jamon-parent/jamon-examples/pom.xml b/jamon-parent/jamon-examples/pom.xml index dac59b17ae..9acfd625b9 100644 --- a/jamon-parent/jamon-examples/pom.xml +++ b/jamon-parent/jamon-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-jamon-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jamon-examples Jamon examples diff --git a/jamon-parent/jamon/pom.xml b/jamon-parent/jamon/pom.xml index de81889d1e..d409430d49 100644 --- a/jamon-parent/jamon/pom.xml +++ b/jamon-parent/jamon/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-jamon-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jamon Jamon diff --git a/jamon-parent/pom.xml b/jamon-parent/pom.xml index 823e6aaafd..b7314ac459 100644 --- a/jamon-parent/pom.xml +++ b/jamon-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jamon-parent pom diff --git a/jasperreports-parent/jasperreports-examples/pom.xml b/jasperreports-parent/jasperreports-examples/pom.xml index 3e6406af6b..9e154fc6b4 100644 --- a/jasperreports-parent/jasperreports-examples/pom.xml +++ b/jasperreports-parent/jasperreports-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff jasperreports-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jasperreports-examples diff --git a/jasperreports-parent/jasperreports/pom.xml b/jasperreports-parent/jasperreports/pom.xml index 7f369df67f..cfc01c262a 100644 --- a/jasperreports-parent/jasperreports/pom.xml +++ b/jasperreports-parent/jasperreports/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff jasperreports-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jasperreports diff --git a/jasperreports-parent/pom.xml b/jasperreports-parent/pom.xml index 935c6c8823..ca916c1233 100644 --- a/jasperreports-parent/pom.xml +++ b/jasperreports-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jasperreports-parent diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml index 4e86487b26..aaadf8823b 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ear/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT javaee-inject-example-ear ear diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml index 1ff9791872..2abd6b0073 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-ejb/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT javaee-inject-example-ejb ejb diff --git a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml index 323bcafd69..fddc97d6eb 100644 --- a/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/javaee-inject-example-war/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT javaee-inject-example-war war diff --git a/javaee-inject-parent/javaee-inject-examples/pom.xml b/javaee-inject-parent/javaee-inject-examples/pom.xml index 7575c2e426..f335fd34ae 100644 --- a/javaee-inject-parent/javaee-inject-examples/pom.xml +++ b/javaee-inject-parent/javaee-inject-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT javaee-inject-examples pom diff --git a/javaee-inject-parent/javaee-inject/pom.xml b/javaee-inject-parent/javaee-inject/pom.xml index cb737c7fa9..1f7eeeeee4 100644 --- a/javaee-inject-parent/javaee-inject/pom.xml +++ b/javaee-inject-parent/javaee-inject/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff javaee-inject-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-javaee-inject jar diff --git a/javaee-inject-parent/pom.xml b/javaee-inject-parent/pom.xml index 891c58e3d5..23d347eb61 100644 --- a/javaee-inject-parent/pom.xml +++ b/javaee-inject-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT javaee-inject-parent pom diff --git a/jee-web-parent/jee-web-examples/pom.xml b/jee-web-parent/jee-web-examples/pom.xml index aa3cb16e37..a39ff59423 100644 --- a/jee-web-parent/jee-web-examples/pom.xml +++ b/jee-web-parent/jee-web-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff jee-web-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jee-web-examples war diff --git a/jee-web-parent/jee-web/pom.xml b/jee-web-parent/jee-web/pom.xml index ef5cef77cd..1edf4f112c 100644 --- a/jee-web-parent/jee-web/pom.xml +++ b/jee-web-parent/jee-web/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff jee-web-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jee-web jar diff --git a/jee-web-parent/pom.xml b/jee-web-parent/pom.xml index 897a275a3b..22b44b7d60 100644 --- a/jee-web-parent/pom.xml +++ b/jee-web-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jee-web-parent pom diff --git a/jqplot-parent/jqplot-examples/pom.xml b/jqplot-parent/jqplot-examples/pom.xml index 173992cbd1..bbc3132369 100644 --- a/jqplot-parent/jqplot-examples/pom.xml +++ b/jqplot-parent/jqplot-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff jqplot-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jqplot-examples diff --git a/jqplot-parent/jqplot/pom.xml b/jqplot-parent/jqplot/pom.xml index d185105436..9e4d9bd038 100644 --- a/jqplot-parent/jqplot/pom.xml +++ b/jqplot-parent/jqplot/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jqplot-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jqplot diff --git a/jqplot-parent/pom.xml b/jqplot-parent/pom.xml index 11ed31acf7..98e0c2fc4e 100644 --- a/jqplot-parent/pom.xml +++ b/jqplot-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jqplot-parent diff --git a/jquery-parent/jquery-examples/pom.xml b/jquery-parent/jquery-examples/pom.xml index 809e9d8883..8418f2cb2a 100644 --- a/jquery-parent/jquery-examples/pom.xml +++ b/jquery-parent/jquery-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jquery-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jquery-examples diff --git a/jquery-parent/jquery/pom.xml b/jquery-parent/jquery/pom.xml index 3306132627..b7513a1c81 100755 --- a/jquery-parent/jquery/pom.xml +++ b/jquery-parent/jquery/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff jquery-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jquery diff --git a/jquery-parent/pom.xml b/jquery-parent/pom.xml index b0b045565d..9634f00751 100644 --- a/jquery-parent/pom.xml +++ b/jquery-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT jquery-parent diff --git a/jwicket-parent/dropdown-menu/pom.xml b/jwicket-parent/dropdown-menu/pom.xml index d7617a24f0..8023348495 100644 --- a/jwicket-parent/dropdown-menu/pom.xml +++ b/jwicket-parent/dropdown-menu/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-core/pom.xml b/jwicket-parent/jwicket-core/pom.xml index 5b6d6918cb..39a1187630 100644 --- a/jwicket-parent/jwicket-core/pom.xml +++ b/jwicket-parent/jwicket-core/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-examples/pom.xml b/jwicket-parent/jwicket-examples/pom.xml index 2aab06d697..e19e7930cc 100644 --- a/jwicket-parent/jwicket-examples/pom.xml +++ b/jwicket-parent/jwicket-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jwicket-examples diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml index 9b5a533e20..b299e8fb2e 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-beautytips/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml index 709f2e486d..ccc3d65131 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-walterzorn/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml index ec560f4998..8988f96199 100644 --- a/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml +++ b/jwicket-parent/jwicket-tooltip/jwicket-tooltip-wtooltips/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-tooltip - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-tooltip/pom.xml b/jwicket-parent/jwicket-tooltip/pom.xml index 53d4ecde8b..e84d7851b0 100644 --- a/jwicket-parent/jwicket-tooltip/pom.xml +++ b/jwicket-parent/jwicket-tooltip/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml index 587e834b46..9a97fe5568 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-accordion/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml index e91aa24694..62853be923 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-datepicker/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml index e2060526ae..501cada0ba 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-dragdrop/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml index 3dabea8327..22ec5b7974 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-effects/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml index 68db804447..38d46816e2 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-resize/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml index 92ad5e985f..05678e6591 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-sort/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-jwicket-ui - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml diff --git a/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml b/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml index f811350f48..10693a5cd3 100644 --- a/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml +++ b/jwicket-parent/jwicket-ui/jwicket-ui-tooltip/pom.xml @@ -15,7 +15,7 @@ wicketstuff-jwicket-ui org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT ../pom.xml wicketstuff-jwicket-ui-tooltip diff --git a/jwicket-parent/jwicket-ui/pom.xml b/jwicket-parent/jwicket-ui/pom.xml index 9f22c4a06b..334b5614b2 100644 --- a/jwicket-parent/jwicket-ui/pom.xml +++ b/jwicket-parent/jwicket-ui/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-jwicket-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jwicket-ui diff --git a/jwicket-parent/pom.xml b/jwicket-parent/pom.xml index 6d1e0a00dd..f7c24f3cb5 100644 --- a/jwicket-parent/pom.xml +++ b/jwicket-parent/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-jwicket-parent diff --git a/lambda-parent/lambda-examples/pom.xml b/lambda-parent/lambda-examples/pom.xml index 39dee0d092..e51f5083c6 100644 --- a/lambda-parent/lambda-examples/pom.xml +++ b/lambda-parent/lambda-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-lambda-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-lambda-examples diff --git a/lambda-parent/lambda/pom.xml b/lambda-parent/lambda/pom.xml index 357daaf329..a74c682ea7 100644 --- a/lambda-parent/lambda/pom.xml +++ b/lambda-parent/lambda/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-lambda-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-lambda diff --git a/lambda-parent/pom.xml b/lambda-parent/pom.xml index 8931313dd4..283eea77f4 100644 --- a/lambda-parent/pom.xml +++ b/lambda-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-lambda-parent diff --git a/lightbox2-parent/lightbox2-examples/pom.xml b/lightbox2-parent/lightbox2-examples/pom.xml index 8d2a48b749..d500f5c52a 100644 --- a/lightbox2-parent/lightbox2-examples/pom.xml +++ b/lightbox2-parent/lightbox2-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff lightbox2-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT lightbox2-examples diff --git a/lightbox2-parent/lightbox2/pom.xml b/lightbox2-parent/lightbox2/pom.xml index 769f47e5f2..7cd8b2e867 100644 --- a/lightbox2-parent/lightbox2/pom.xml +++ b/lightbox2-parent/lightbox2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff lightbox2-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT lightbox2 diff --git a/lightbox2-parent/pom.xml b/lightbox2-parent/pom.xml index 2342c1649c..c2f8869424 100644 --- a/lightbox2-parent/pom.xml +++ b/lightbox2-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT lightbox2-parent diff --git a/mbeanview-parent/mbeanview-examples/pom.xml b/mbeanview-parent/mbeanview-examples/pom.xml index d55abafd68..ebe6cc47d2 100644 --- a/mbeanview-parent/mbeanview-examples/pom.xml +++ b/mbeanview-parent/mbeanview-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff mbeanview-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT mbeanview-examples diff --git a/mbeanview-parent/mbeanview/pom.xml b/mbeanview-parent/mbeanview/pom.xml index ce4da785a9..d9b6d2a85b 100644 --- a/mbeanview-parent/mbeanview/pom.xml +++ b/mbeanview-parent/mbeanview/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff mbeanview-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-mbeanview diff --git a/mbeanview-parent/pom.xml b/mbeanview-parent/pom.xml index 51deba40b9..6361a684d3 100644 --- a/mbeanview-parent/pom.xml +++ b/mbeanview-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT mbeanview-parent diff --git a/minis-parent/minis-examples/pom.xml b/minis-parent/minis-examples/pom.xml index 6b4145f928..46fde76e19 100644 --- a/minis-parent/minis-examples/pom.xml +++ b/minis-parent/minis-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff minis-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-minis-examples diff --git a/minis-parent/minis/pom.xml b/minis-parent/minis/pom.xml index fde08efdf6..c771f54e8f 100644 --- a/minis-parent/minis/pom.xml +++ b/minis-parent/minis/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff minis-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-minis diff --git a/minis-parent/pom.xml b/minis-parent/pom.xml index 1a3e0f9e3c..48df21ca55 100644 --- a/minis-parent/pom.xml +++ b/minis-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT minis-parent diff --git a/modalx-parent/modalx-examples/pom.xml b/modalx-parent/modalx-examples/pom.xml index c43f2ae3c4..63df16d435 100644 --- a/modalx-parent/modalx-examples/pom.xml +++ b/modalx-parent/modalx-examples/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff modalx-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT modalx-examples diff --git a/modalx-parent/modalx/pom.xml b/modalx-parent/modalx/pom.xml index d2e1161b80..71c94d9fc6 100644 --- a/modalx-parent/modalx/pom.xml +++ b/modalx-parent/modalx/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff modalx-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT modalx diff --git a/modalx-parent/pom.xml b/modalx-parent/pom.xml index 95a2f95b8a..3bdf3bc698 100644 --- a/modalx-parent/pom.xml +++ b/modalx-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT modalx-parent ModalX Parent diff --git a/nashorn-parent/nashorn-examples/pom.xml b/nashorn-parent/nashorn-examples/pom.xml index e274039d81..58ca5677c6 100644 --- a/nashorn-parent/nashorn-examples/pom.xml +++ b/nashorn-parent/nashorn-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-nashorn-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-nashorn-examples diff --git a/nashorn-parent/nashorn/pom.xml b/nashorn-parent/nashorn/pom.xml index 952cc6913b..d8f3c87170 100644 --- a/nashorn-parent/nashorn/pom.xml +++ b/nashorn-parent/nashorn/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-nashorn-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-nashorn diff --git a/nashorn-parent/pom.xml b/nashorn-parent/pom.xml index 36752c7d17..723590c762 100644 --- a/nashorn-parent/pom.xml +++ b/nashorn-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-nashorn-parent diff --git a/objectautocomplete-parent/objectautocomplete-examples/pom.xml b/objectautocomplete-parent/objectautocomplete-examples/pom.xml index c523e25d97..4e3cd021d7 100644 --- a/objectautocomplete-parent/objectautocomplete-examples/pom.xml +++ b/objectautocomplete-parent/objectautocomplete-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-objectautocomplete-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-objectautocomplete-examples diff --git a/objectautocomplete-parent/objectautocomplete/pom.xml b/objectautocomplete-parent/objectautocomplete/pom.xml index 917ef12bbb..c2ba1b10f5 100644 --- a/objectautocomplete-parent/objectautocomplete/pom.xml +++ b/objectautocomplete-parent/objectautocomplete/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-objectautocomplete-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-objectautocomplete diff --git a/objectautocomplete-parent/pom.xml b/objectautocomplete-parent/pom.xml index 5a3e41ff61..5b8ee6cfda 100644 --- a/objectautocomplete-parent/pom.xml +++ b/objectautocomplete-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-objectautocomplete-parent diff --git a/offline-mode-parent/offline-mode-examples/pom.xml b/offline-mode-parent/offline-mode-examples/pom.xml index 3a628d8ba9..dae444669e 100644 --- a/offline-mode-parent/offline-mode-examples/pom.xml +++ b/offline-mode-parent/offline-mode-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-offline-mode-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-offline-mode-examples diff --git a/offline-mode-parent/offline-mode/pom.xml b/offline-mode-parent/offline-mode/pom.xml index 4c42569974..a4986c4d08 100644 --- a/offline-mode-parent/offline-mode/pom.xml +++ b/offline-mode-parent/offline-mode/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-offline-mode-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-offline-mode diff --git a/offline-mode-parent/pom.xml b/offline-mode-parent/pom.xml index b8e7e063c2..e3424fe4cd 100644 --- a/offline-mode-parent/pom.xml +++ b/offline-mode-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-offline-mode-parent diff --git a/openlayers-parent/openlayers-examples/pom.xml b/openlayers-parent/openlayers-examples/pom.xml index 22c926e3f9..665444b8ac 100644 --- a/openlayers-parent/openlayers-examples/pom.xml +++ b/openlayers-parent/openlayers-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff openlayers-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT openlayers-examples diff --git a/openlayers-parent/openlayers-proxy/pom.xml b/openlayers-parent/openlayers-proxy/pom.xml index 8f59406c17..373cab14f6 100644 --- a/openlayers-parent/openlayers-proxy/pom.xml +++ b/openlayers-parent/openlayers-proxy/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-openlayers-proxy diff --git a/openlayers-parent/openlayers/pom.xml b/openlayers-parent/openlayers/pom.xml index 2a167c0df0..a2b9796330 100644 --- a/openlayers-parent/openlayers/pom.xml +++ b/openlayers-parent/openlayers/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-openlayers diff --git a/openlayers-parent/pom.xml b/openlayers-parent/pom.xml index c80cb778a5..0fc35f6704 100644 --- a/openlayers-parent/pom.xml +++ b/openlayers-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT openlayers-parent diff --git a/openlayers3-parent/openlayers3-bootstrap/pom.xml b/openlayers3-parent/openlayers3-bootstrap/pom.xml index 2e9a927b48..17f6c455f8 100644 --- a/openlayers3-parent/openlayers3-bootstrap/pom.xml +++ b/openlayers3-parent/openlayers3-bootstrap/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-openlayers3-bootstrap diff --git a/openlayers3-parent/openlayers3-examples/pom.xml b/openlayers3-parent/openlayers3-examples/pom.xml index 45959331c3..07f5b85b7d 100644 --- a/openlayers3-parent/openlayers3-examples/pom.xml +++ b/openlayers3-parent/openlayers3-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff openlayers3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT openlayers3-examples diff --git a/openlayers3-parent/openlayers3/pom.xml b/openlayers3-parent/openlayers3/pom.xml index 54f79983ed..de3397a2f7 100644 --- a/openlayers3-parent/openlayers3/pom.xml +++ b/openlayers3-parent/openlayers3/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff openlayers3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-openlayers3 diff --git a/openlayers3-parent/pom.xml b/openlayers3-parent/pom.xml index 54f7fde950..7306db3aa4 100644 --- a/openlayers3-parent/pom.xml +++ b/openlayers3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT openlayers3-parent diff --git a/phonebook/pom.xml b/phonebook/pom.xml index 02ea0ec611..2debaed56a 100644 --- a/phonebook/pom.xml +++ b/phonebook/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-phonebook diff --git a/plugin/pom.xml b/plugin/pom.xml index a0dd4865c8..9102e083a5 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-plugin diff --git a/pom.xml b/pom.xml index 51e1f0e158..d51d289cec 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core pom - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT WicketStuff Core Parent WicketStuff Core Parent is the parent project for all of the core WicketStuff projects. It tries diff --git a/portlet-parent/pom.xml b/portlet-parent/pom.xml index e25cffe6d0..f320a7065b 100644 --- a/portlet-parent/pom.xml +++ b/portlet-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-portlet-parent Portlet Parent diff --git a/portlet-parent/wicketstuff-portlet-examples/pom.xml b/portlet-parent/wicketstuff-portlet-examples/pom.xml index a302b91c15..b225ca2112 100644 --- a/portlet-parent/wicketstuff-portlet-examples/pom.xml +++ b/portlet-parent/wicketstuff-portlet-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-portlet-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-portlet-examples diff --git a/portlet-parent/wicketstuff-portlet/pom.xml b/portlet-parent/wicketstuff-portlet/pom.xml index 9389af4e06..1faa0aa1cd 100644 --- a/portlet-parent/wicketstuff-portlet/pom.xml +++ b/portlet-parent/wicketstuff-portlet/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-portlet-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-portlet diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index 503fd7f488..ee58f7fc79 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT progressbar-parent diff --git a/progressbar-parent/progressbar-example/pom.xml b/progressbar-parent/progressbar-example/pom.xml index 73042339f1..593126d94c 100644 --- a/progressbar-parent/progressbar-example/pom.xml +++ b/progressbar-parent/progressbar-example/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff progressbar-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT progressbar-example diff --git a/progressbar-parent/progressbar-spring/pom.xml b/progressbar-parent/progressbar-spring/pom.xml index 553366f79e..d957dd8f68 100644 --- a/progressbar-parent/progressbar-spring/pom.xml +++ b/progressbar-parent/progressbar-spring/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff progressbar-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-progressbar-spring TaskService for use with user submitted background tasks and the progress bar. Could be used with Spring or any other application framework. diff --git a/progressbar-parent/progressbar/pom.xml b/progressbar-parent/progressbar/pom.xml index 7ef9fd4cf2..d577fc848d 100644 --- a/progressbar-parent/progressbar/pom.xml +++ b/progressbar-parent/progressbar/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff progressbar-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-progressbar diff --git a/push-parent/pom.xml b/push-parent/pom.xml index 06f3f8d830..882169f652 100644 --- a/push-parent/pom.xml +++ b/push-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT push-parent diff --git a/push-parent/push-cometd/pom.xml b/push-parent/push-cometd/pom.xml index 8024c8ca2d..fd4116f097 100644 --- a/push-parent/push-cometd/pom.xml +++ b/push-parent/push-cometd/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff push-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-push-cometd diff --git a/push-parent/push-core/pom.xml b/push-parent/push-core/pom.xml index e01f94624d..78855a445d 100644 --- a/push-parent/push-core/pom.xml +++ b/push-parent/push-core/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff push-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-push-core diff --git a/push-parent/push-examples/pom.xml b/push-parent/push-examples/pom.xml index f40485a7bf..748e6885a1 100644 --- a/push-parent/push-examples/pom.xml +++ b/push-parent/push-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff push-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-push-examples diff --git a/push-parent/push-timer/pom.xml b/push-parent/push-timer/pom.xml index a96db0246d..3bfd2c0b0d 100644 --- a/push-parent/push-timer/pom.xml +++ b/push-parent/push-timer/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff push-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-push-timer diff --git a/scala-extensions-parent/pom.xml b/scala-extensions-parent/pom.xml index b3c91659a4..1fe25386c1 100644 --- a/scala-extensions-parent/pom.xml +++ b/scala-extensions-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT org.wicketstuff.scala diff --git a/scala-extensions-parent/wicket-scala-archetype/pom.xml b/scala-extensions-parent/wicket-scala-archetype/pom.xml index c7c050a48e..0d390275c5 100644 --- a/scala-extensions-parent/wicket-scala-archetype/pom.xml +++ b/scala-extensions-parent/wicket-scala-archetype/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT maven-archetype diff --git a/scala-extensions-parent/wicket-scala-sample/pom.xml b/scala-extensions-parent/wicket-scala-sample/pom.xml index 54f9154fa8..2f5e00db27 100644 --- a/scala-extensions-parent/wicket-scala-sample/pom.xml +++ b/scala-extensions-parent/wicket-scala-sample/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-sample diff --git a/scala-extensions-parent/wicket-scala/pom.xml b/scala-extensions-parent/wicket-scala/pom.xml index 11dbf7c490..d8f988d244 100644 --- a/scala-extensions-parent/wicket-scala/pom.xml +++ b/scala-extensions-parent/wicket-scala/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff.scala scala-extensions-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-scala diff --git a/select2-parent/pom.xml b/select2-parent/pom.xml index db7bfed39e..e68f3b8caf 100755 --- a/select2-parent/pom.xml +++ b/select2-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-select2-parent pom diff --git a/select2-parent/select2-examples/pom.xml b/select2-parent/select2-examples/pom.xml index 98ab714780..946ad09eb9 100755 --- a/select2-parent/select2-examples/pom.xml +++ b/select2-parent/select2-examples/pom.xml @@ -4,7 +4,7 @@ wicketstuff-select2-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-select2-examples war diff --git a/select2-parent/select2/pom.xml b/select2-parent/select2/pom.xml index 06fca9611a..59b5cde749 100755 --- a/select2-parent/select2/pom.xml +++ b/select2-parent/select2/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-select2-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 wicketstuff-select2 diff --git a/serializer-common/pom.xml b/serializer-common/pom.xml index 9c1a8cb89c..fa32ad2415 100644 --- a/serializer-common/pom.xml +++ b/serializer-common/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-common diff --git a/serializer-fast/pom.xml b/serializer-fast/pom.xml index 526bd446cc..d1d510fe0b 100644 --- a/serializer-fast/pom.xml +++ b/serializer-fast/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-fast diff --git a/serializer-fast2/pom.xml b/serializer-fast2/pom.xml index 3b5962cd53..e7b996b8f0 100644 --- a/serializer-fast2/pom.xml +++ b/serializer-fast2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-fast2 diff --git a/serializer-kryo/pom.xml b/serializer-kryo/pom.xml index 6086da9b84..f5ea09f44e 100644 --- a/serializer-kryo/pom.xml +++ b/serializer-kryo/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-kryo diff --git a/serializer-kryo2/pom.xml b/serializer-kryo2/pom.xml index effbfbff42..08f3f8c29b 100644 --- a/serializer-kryo2/pom.xml +++ b/serializer-kryo2/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-kryo2 diff --git a/serializer-ui/pom.xml b/serializer-ui/pom.xml index 5ce0469c7f..9188c3efea 100644 --- a/serializer-ui/pom.xml +++ b/serializer-ui/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-serializer-ui diff --git a/shiro-security/pom.xml b/shiro-security/pom.xml index f1ce56b217..5b34f05e06 100644 --- a/shiro-security/pom.xml +++ b/shiro-security/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-parent diff --git a/shiro-security/wicket-shiro-examples/pom.xml b/shiro-security/wicket-shiro-examples/pom.xml index 933a6c0b44..3c2f570707 100644 --- a/shiro-security/wicket-shiro-examples/pom.xml +++ b/shiro-security/wicket-shiro-examples/pom.xml @@ -22,7 +22,7 @@ org.wicketstuff wicket-shiro-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-examples diff --git a/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml index 43eff0a2c2..d00ab98864 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-base/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-example-base diff --git a/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml index e34a3e94c4..67eb93a4f1 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-realm/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-example-realm diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml index 63da448f1d..6f59a33b68 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate-native/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-example-spring-hibernate-native diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml index 6035bafc44..7882945289 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-hibernate/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-example-spring-hibernate diff --git a/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml b/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml index 399fcecce9..981d5c9997 100644 --- a/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml +++ b/shiro-security/wicket-shiro-examples/shiro-example-spring-jdbc/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicket-shiro-examples - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-shiro-example-spring-jdbc diff --git a/shiro-security/wicket-shiro/pom.xml b/shiro-security/wicket-shiro/pom.xml index 09e4830783..7cf81b8a99 100644 --- a/shiro-security/wicket-shiro/pom.xml +++ b/shiro-security/wicket-shiro/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicket-shiro-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-shiro diff --git a/simile-timeline-parent/pom.xml b/simile-timeline-parent/pom.xml index 5ac7fbc837..8e3e556a6d 100644 --- a/simile-timeline-parent/pom.xml +++ b/simile-timeline-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT simile-timeline-parent diff --git a/simile-timeline-parent/simile-timeline/pom.xml b/simile-timeline-parent/simile-timeline/pom.xml index acad094707..7ad51e175d 100644 --- a/simile-timeline-parent/simile-timeline/pom.xml +++ b/simile-timeline-parent/simile-timeline/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff simile-timeline-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-simile-timeline diff --git a/sitemap-xml-parent/pom.xml b/sitemap-xml-parent/pom.xml index 77673a5aab..b2c9f9d51c 100644 --- a/sitemap-xml-parent/pom.xml +++ b/sitemap-xml-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT sitemap-xml-parent diff --git a/sitemap-xml-parent/sitemap-xml-examples/pom.xml b/sitemap-xml-parent/sitemap-xml-examples/pom.xml index bc1e252a8c..b879deb83a 100644 --- a/sitemap-xml-parent/sitemap-xml-examples/pom.xml +++ b/sitemap-xml-parent/sitemap-xml-examples/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff sitemap-xml-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT sitemap-xml-examples wicketstuff-sitemap-xml-examples diff --git a/sitemap-xml-parent/sitemap-xml/pom.xml b/sitemap-xml-parent/sitemap-xml/pom.xml index 751fe7d7b5..833e82b73b 100644 --- a/sitemap-xml-parent/sitemap-xml/pom.xml +++ b/sitemap-xml-parent/sitemap-xml/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff sitemap-xml-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-sitemap-xml jar diff --git a/stateless-parent/pom.xml b/stateless-parent/pom.xml index 34f65ec475..148ee197d3 100644 --- a/stateless-parent/pom.xml +++ b/stateless-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-stateless-parent diff --git a/stateless-parent/stateless-examples/pom.xml b/stateless-parent/stateless-examples/pom.xml index e1ae356570..f8ca939cd5 100644 --- a/stateless-parent/stateless-examples/pom.xml +++ b/stateless-parent/stateless-examples/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-stateless-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-stateless-examples diff --git a/stateless-parent/stateless/pom.xml b/stateless-parent/stateless/pom.xml index 99a0c8cab6..e957606b62 100644 --- a/stateless-parent/stateless/pom.xml +++ b/stateless-parent/stateless/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-stateless-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-stateless diff --git a/tinymce3-parent/pom.xml b/tinymce3-parent/pom.xml index b6fbfe9ab8..8aaed219b4 100644 --- a/tinymce3-parent/pom.xml +++ b/tinymce3-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT tinymce3-parent diff --git a/tinymce3-parent/tinymce3-examples/pom.xml b/tinymce3-parent/tinymce3-examples/pom.xml index bf56a05398..db4ef0227a 100644 --- a/tinymce3-parent/tinymce3-examples/pom.xml +++ b/tinymce3-parent/tinymce3-examples/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT tinymce3-examples diff --git a/tinymce3-parent/tinymce3/pom.xml b/tinymce3-parent/tinymce3/pom.xml index 36f7219e28..3758936853 100644 --- a/tinymce3-parent/tinymce3/pom.xml +++ b/tinymce3-parent/tinymce3/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-tinymce3 diff --git a/tinymce4-parent/pom.xml b/tinymce4-parent/pom.xml index ca51a492b0..ae74185fc7 100644 --- a/tinymce4-parent/pom.xml +++ b/tinymce4-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT tinymce4-parent diff --git a/tinymce4-parent/tinymce4-examples/pom.xml b/tinymce4-parent/tinymce4-examples/pom.xml index de32556931..cb6b3d97c0 100644 --- a/tinymce4-parent/tinymce4-examples/pom.xml +++ b/tinymce4-parent/tinymce4-examples/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce4-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT tinymce4-examples diff --git a/tinymce4-parent/tinymce4/pom.xml b/tinymce4-parent/tinymce4/pom.xml index 5164717a42..4ca433211c 100644 --- a/tinymce4-parent/tinymce4/pom.xml +++ b/tinymce4-parent/tinymce4/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff tinymce4-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-tinymce4 diff --git a/twitter-parent/pom.xml b/twitter-parent/pom.xml index a05667bb91..bb92a91151 100644 --- a/twitter-parent/pom.xml +++ b/twitter-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT twitter-parent diff --git a/twitter-parent/twitter-examples/pom.xml b/twitter-parent/twitter-examples/pom.xml index d8dce37076..fdceeec452 100644 --- a/twitter-parent/twitter-examples/pom.xml +++ b/twitter-parent/twitter-examples/pom.xml @@ -3,7 +3,7 @@ twitter-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-twitter-examples war diff --git a/twitter-parent/twitter/pom.xml b/twitter-parent/twitter/pom.xml index 687e79c0e2..2eb4904ecf 100644 --- a/twitter-parent/twitter/pom.xml +++ b/twitter-parent/twitter/pom.xml @@ -3,7 +3,7 @@ twitter-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-twitter diff --git a/urlfragment-parent/pom.xml b/urlfragment-parent/pom.xml index d231f0e412..d8c2704257 100644 --- a/urlfragment-parent/pom.xml +++ b/urlfragment-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-urlfragment-parent diff --git a/urlfragment-parent/urlfragment-example/pom.xml b/urlfragment-parent/urlfragment-example/pom.xml index f110e15b06..966170d6db 100644 --- a/urlfragment-parent/urlfragment-example/pom.xml +++ b/urlfragment-parent/urlfragment-example/pom.xml @@ -23,7 +23,7 @@ org.wicketstuff wicketstuff-urlfragment-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-urlfragment-examples diff --git a/urlfragment-parent/urlfragment/pom.xml b/urlfragment-parent/urlfragment/pom.xml index bde4fda95d..f1628ded39 100644 --- a/urlfragment-parent/urlfragment/pom.xml +++ b/urlfragment-parent/urlfragment/pom.xml @@ -21,7 +21,7 @@ org.wicketstuff wicketstuff-urlfragment-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 wicketstuff-urlfragment diff --git a/whiteboard-parent/pom.xml b/whiteboard-parent/pom.xml index 633efcee31..84c373dd74 100644 --- a/whiteboard-parent/pom.xml +++ b/whiteboard-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-whiteboard-parent diff --git a/whiteboard-parent/whiteboard-examples/pom.xml b/whiteboard-parent/whiteboard-examples/pom.xml index 5b2f512ac7..8864a97b84 100644 --- a/whiteboard-parent/whiteboard-examples/pom.xml +++ b/whiteboard-parent/whiteboard-examples/pom.xml @@ -7,7 +7,7 @@ wicketstuff-whiteboard-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-whiteboard-examples diff --git a/whiteboard-parent/whiteboard/pom.xml b/whiteboard-parent/whiteboard/pom.xml index f263be94dd..13c8664e83 100644 --- a/whiteboard-parent/whiteboard/pom.xml +++ b/whiteboard-parent/whiteboard/pom.xml @@ -7,7 +7,7 @@ wicketstuff-whiteboard-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-whiteboard diff --git a/wicket-bundle-parent/pom.xml b/wicket-bundle-parent/pom.xml index f5cf8f21d7..0e366d0426 100644 --- a/wicket-bundle-parent/pom.xml +++ b/wicket-bundle-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-bundle-parent diff --git a/wicket-bundle-parent/wicket-bundle/pom.xml b/wicket-bundle-parent/wicket-bundle/pom.xml index a6bd222ae8..834ebd7984 100644 --- a/wicket-bundle-parent/wicket-bundle/pom.xml +++ b/wicket-bundle-parent/wicket-bundle/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicket-bundle-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-bundle diff --git a/wicket-bundle-parent/wicket-ioc-bundle/pom.xml b/wicket-bundle-parent/wicket-ioc-bundle/pom.xml index 37739140e8..35b625919a 100644 --- a/wicket-bundle-parent/wicket-ioc-bundle/pom.xml +++ b/wicket-bundle-parent/wicket-ioc-bundle/pom.xml @@ -3,7 +3,7 @@ wicket-bundle-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-ioc-bundle bundle diff --git a/wicket-facebook-parent/pom.xml b/wicket-facebook-parent/pom.xml index 98efe40260..d8fcd0ca61 100644 --- a/wicket-facebook-parent/pom.xml +++ b/wicket-facebook-parent/pom.xml @@ -4,7 +4,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT Wicket Facebook :: Parent diff --git a/wicket-facebook-parent/wicket-facebook-examples/pom.xml b/wicket-facebook-parent/wicket-facebook-examples/pom.xml index 3283c2f508..ebbfd75f27 100644 --- a/wicket-facebook-parent/wicket-facebook-examples/pom.xml +++ b/wicket-facebook-parent/wicket-facebook-examples/pom.xml @@ -4,7 +4,7 @@ wicket-facebook-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-facebook-examples Wicket Facebook Examples diff --git a/wicket-facebook-parent/wicket-facebook/pom.xml b/wicket-facebook-parent/wicket-facebook/pom.xml index 42f90c7638..da2aa38a2a 100644 --- a/wicket-facebook-parent/wicket-facebook/pom.xml +++ b/wicket-facebook-parent/wicket-facebook/pom.xml @@ -4,7 +4,7 @@ wicket-facebook-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-facebook Wicket Facebook diff --git a/wicket-foundation/pom.xml b/wicket-foundation/pom.xml index a9925b897f..11d536f425 100644 --- a/wicket-foundation/pom.xml +++ b/wicket-foundation/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT org.wicketstuff.foundation diff --git a/wicket-foundation/wicket-foundation-core/pom.xml b/wicket-foundation/wicket-foundation-core/pom.xml index 42f410bcb5..f23a4a5839 100644 --- a/wicket-foundation/wicket-foundation-core/pom.xml +++ b/wicket-foundation/wicket-foundation-core/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff.foundation wicket-foundation-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-foundation-core diff --git a/wicket-foundation/wicket-foundation-samples/pom.xml b/wicket-foundation/wicket-foundation-samples/pom.xml index 53f3026e61..0dbe890d04 100644 --- a/wicket-foundation/wicket-foundation-samples/pom.xml +++ b/wicket-foundation/wicket-foundation-samples/pom.xml @@ -7,7 +7,7 @@ wicket-foundation-parent org.wicketstuff.foundation - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-foundation-samples diff --git a/wicket-html5-parent/pom.xml b/wicket-html5-parent/pom.xml index 13f7c2bed0..cd957e66bb 100644 --- a/wicket-html5-parent/pom.xml +++ b/wicket-html5-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-html5-parent diff --git a/wicket-html5-parent/wicket-html5-examples/pom.xml b/wicket-html5-parent/wicket-html5-examples/pom.xml index 71e25af974..59f89b6d6b 100644 --- a/wicket-html5-parent/wicket-html5-examples/pom.xml +++ b/wicket-html5-parent/wicket-html5-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-html5-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-html5-examples diff --git a/wicket-html5-parent/wicket-html5/pom.xml b/wicket-html5-parent/wicket-html5/pom.xml index 4f5f597bf0..beb66929f5 100644 --- a/wicket-html5-parent/wicket-html5/pom.xml +++ b/wicket-html5-parent/wicket-html5/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-html5-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-html5 diff --git a/wicket-mount-parent/pom.xml b/wicket-mount-parent/pom.xml index b00b52c89e..0a25933d65 100644 --- a/wicket-mount-parent/pom.xml +++ b/wicket-mount-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-mount-parent diff --git a/wicket-mount-parent/wicket-mount-core/pom.xml b/wicket-mount-parent/wicket-mount-core/pom.xml index 8101921ae8..787e56dc94 100644 --- a/wicket-mount-parent/wicket-mount-core/pom.xml +++ b/wicket-mount-parent/wicket-mount-core/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-mount-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/wicket-mount-parent/wicket-mount-example/pom.xml b/wicket-mount-parent/wicket-mount-example/pom.xml index 6b903965c6..62318e618d 100644 --- a/wicket-mount-parent/wicket-mount-example/pom.xml +++ b/wicket-mount-parent/wicket-mount-example/pom.xml @@ -5,7 +5,7 @@ wicket-mount-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT org.wicketstuff diff --git a/wicket-mount-parent/wicket-mount/pom.xml b/wicket-mount-parent/wicket-mount/pom.xml index ca9481c1c5..d213404a5d 100644 --- a/wicket-mount-parent/wicket-mount/pom.xml +++ b/wicket-mount-parent/wicket-mount/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-mount-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 wicket-mount diff --git a/wicket-osgi-parent/pom.xml b/wicket-osgi-parent/pom.xml index 1def23abe6..7b8fc8c5f8 100644 --- a/wicket-osgi-parent/pom.xml +++ b/wicket-osgi-parent/pom.xml @@ -3,7 +3,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-osgi-parent Wicket OSGi Parent diff --git a/wicket-osgi-parent/wicket-osgi-test-service/pom.xml b/wicket-osgi-parent/wicket-osgi-test-service/pom.xml index 6bf2fa87e4..7e8b70a104 100644 --- a/wicket-osgi-parent/wicket-osgi-test-service/pom.xml +++ b/wicket-osgi-parent/wicket-osgi-test-service/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-osgi-test-service bundle diff --git a/wicket-osgi-parent/wicket-osgi-test-web/pom.xml b/wicket-osgi-parent/wicket-osgi-test-web/pom.xml index 6bef563dcd..ffa87c176b 100644 --- a/wicket-osgi-parent/wicket-osgi-test-web/pom.xml +++ b/wicket-osgi-parent/wicket-osgi-test-web/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-osgi-test-web bundle diff --git a/wicket-osgi-parent/wicket-osgi/pom.xml b/wicket-osgi-parent/wicket-osgi/pom.xml index b6ac8dabce..2a8985e3d3 100644 --- a/wicket-osgi-parent/wicket-osgi/pom.xml +++ b/wicket-osgi-parent/wicket-osgi/pom.xml @@ -3,7 +3,7 @@ wicket-osgi-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-osgi bundle diff --git a/wicket-poi-parent/pom.xml b/wicket-poi-parent/pom.xml index c0f431a43e..99b219f35d 100644 --- a/wicket-poi-parent/pom.xml +++ b/wicket-poi-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-poi-parent diff --git a/wicket-poi-parent/wicket-poi-examples/pom.xml b/wicket-poi-parent/wicket-poi-examples/pom.xml index 3f4a849e59..59e1c47ad0 100644 --- a/wicket-poi-parent/wicket-poi-examples/pom.xml +++ b/wicket-poi-parent/wicket-poi-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-poi-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-poi-examples diff --git a/wicket-poi-parent/wicket-poi/pom.xml b/wicket-poi-parent/wicket-poi/pom.xml index b77e1f6dce..a017b12a25 100644 --- a/wicket-poi-parent/wicket-poi/pom.xml +++ b/wicket-poi-parent/wicket-poi/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicket-poi-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-poi diff --git a/wicket-security-parent/pom.xml b/wicket-security-parent/pom.xml index d38b958c5e..dc6c1a28c7 100644 --- a/wicket-security-parent/pom.xml +++ b/wicket-security-parent/pom.xml @@ -19,7 +19,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 wicket-security-parent diff --git a/wicket-security-parent/swarm-parent/hive/pom.xml b/wicket-security-parent/swarm-parent/hive/pom.xml index 352fa3d0af..02df456d85 100644 --- a/wicket-security-parent/swarm-parent/hive/pom.xml +++ b/wicket-security-parent/swarm-parent/hive/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-swarm-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-security-hive jar diff --git a/wicket-security-parent/swarm-parent/pom.xml b/wicket-security-parent/swarm-parent/pom.xml index d8fc2b7b23..19ff3055e2 100644 --- a/wicket-security-parent/swarm-parent/pom.xml +++ b/wicket-security-parent/swarm-parent/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-security-swarm-parent pom diff --git a/wicket-security-parent/swarm-parent/swarm/pom.xml b/wicket-security-parent/swarm-parent/swarm/pom.xml index 068143c942..0e20d70160 100644 --- a/wicket-security-parent/swarm-parent/swarm/pom.xml +++ b/wicket-security-parent/swarm-parent/swarm/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-swarm-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-security-swarm jar diff --git a/wicket-security-parent/wasp-parent/pom.xml b/wicket-security-parent/wasp-parent/pom.xml index 8ff46b09a9..7201074aeb 100644 --- a/wicket-security-parent/wasp-parent/pom.xml +++ b/wicket-security-parent/wasp-parent/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicket-security-wasp-parent pom diff --git a/wicket-security-parent/wasp-parent/wasp/pom.xml b/wicket-security-parent/wasp-parent/wasp/pom.xml index 6ccf67a6a2..ec04afeaf8 100644 --- a/wicket-security-parent/wasp-parent/wasp/pom.xml +++ b/wicket-security-parent/wasp-parent/wasp/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-wasp-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-security-wasp jar diff --git a/wicket-security-parent/wasp-parent/wicomsec/pom.xml b/wicket-security-parent/wasp-parent/wicomsec/pom.xml index 773ad18c47..2a2b4b8adb 100644 --- a/wicket-security-parent/wasp-parent/wicomsec/pom.xml +++ b/wicket-security-parent/wasp-parent/wicomsec/pom.xml @@ -20,7 +20,7 @@ org.wicketstuff wicket-security-wasp-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-security-wicomsec jar diff --git a/wicket-servlet3-parent/pom.xml b/wicket-servlet3-parent/pom.xml index c3c2478007..88f8941848 100644 --- a/wicket-servlet3-parent/pom.xml +++ b/wicket-servlet3-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-servlet3-parent diff --git a/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml b/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml index f9a8b332b9..10dd8e7ad5 100644 --- a/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml +++ b/wicket-servlet3-parent/wicket-servlet3-auth/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-servlet3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-servlet3-auth diff --git a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml index 25750576dd..ff19a238d4 100644 --- a/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml +++ b/wicket-servlet3-parent/wicket-servlet3-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-servlet3-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-servlet3-examples diff --git a/wicketstuff-glassfish4-integration/pom.xml b/wicketstuff-glassfish4-integration/pom.xml index 90acbf7194..6b1272ebb4 100644 --- a/wicketstuff-glassfish4-integration/pom.xml +++ b/wicketstuff-glassfish4-integration/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-glassfish4-integration jar diff --git a/wicketstuff-lazymodel/pom.xml b/wicketstuff-lazymodel/pom.xml index a5e3e6e891..92581e825b 100644 --- a/wicketstuff-lazymodel/pom.xml +++ b/wicketstuff-lazymodel/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-lazymodel diff --git a/wicketstuff-logback-parent/pom.xml b/wicketstuff-logback-parent/pom.xml index 951156cd75..e7315b2f83 100644 --- a/wicketstuff-logback-parent/pom.xml +++ b/wicketstuff-logback-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-logback-parent diff --git a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml index 3235f3f151..d68409e9fc 100644 --- a/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml +++ b/wicketstuff-logback-parent/wicketstuff-logback-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-logback-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-logback-examples diff --git a/wicketstuff-logback-parent/wicketstuff-logback/pom.xml b/wicketstuff-logback-parent/wicketstuff-logback/pom.xml index a89214d8ac..76fca4a7a5 100644 --- a/wicketstuff-logback-parent/wicketstuff-logback/pom.xml +++ b/wicketstuff-logback-parent/wicketstuff-logback/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-logback-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-logback diff --git a/wicketstuff-restannotations-parent/pom.xml b/wicketstuff-restannotations-parent/pom.xml index 997e6c67ba..4ee62dcb66 100644 --- a/wicketstuff-restannotations-parent/pom.xml +++ b/wicketstuff-restannotations-parent/pom.xml @@ -16,7 +16,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-restannotations-parent diff --git a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml index 8b819d8c75..79ff9c23ac 100644 --- a/wicketstuff-restannotations-parent/restannotations-examples/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations-examples/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT org.wicketstuff diff --git a/wicketstuff-restannotations-parent/restannotations-json/pom.xml b/wicketstuff-restannotations-parent/restannotations-json/pom.xml index f4367480eb..6194e368f3 100644 --- a/wicketstuff-restannotations-parent/restannotations-json/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations-json/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-restannotations-json diff --git a/wicketstuff-restannotations-parent/restannotations/pom.xml b/wicketstuff-restannotations-parent/restannotations/pom.xml index 9108be7348..7b468bb3e0 100644 --- a/wicketstuff-restannotations-parent/restannotations/pom.xml +++ b/wicketstuff-restannotations-parent/restannotations/pom.xml @@ -17,7 +17,7 @@ wicketstuff-restannotations-parent org.wicketstuff - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-restannotations diff --git a/wicketstuff-selectize-parent/pom.xml b/wicketstuff-selectize-parent/pom.xml index 2fa5cdc519..d9482a3f2d 100644 --- a/wicketstuff-selectize-parent/pom.xml +++ b/wicketstuff-selectize-parent/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-selectize-parent diff --git a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml index 698ea837dd..898e7ba8e0 100644 --- a/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml +++ b/wicketstuff-selectize-parent/wicketstuff-selectize-examples/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-selectize-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-selectize-examples diff --git a/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml b/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml index add23ecf71..ff08c21375 100644 --- a/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml +++ b/wicketstuff-selectize-parent/wicketstuff-selectize/pom.xml @@ -6,7 +6,7 @@ org.wicketstuff wicketstuff-selectize-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-selectize diff --git a/wicketstuff-springreference-parent/pom.xml b/wicketstuff-springreference-parent/pom.xml index 40c5566549..7646ee8b34 100644 --- a/wicketstuff-springreference-parent/pom.xml +++ b/wicketstuff-springreference-parent/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-springreference-parent diff --git a/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml b/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml index afa5a9baef..eb303220f6 100644 --- a/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml +++ b/wicketstuff-springreference-parent/wicketstuff-springreference-examples/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-springreference-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-springreference-examples diff --git a/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml b/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml index 2f80c0396f..83da1d77d9 100644 --- a/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml +++ b/wicketstuff-springreference-parent/wicketstuff-springreference/pom.xml @@ -7,7 +7,7 @@ org.wicketstuff wicketstuff-springreference-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-springreference diff --git a/yui-parent/pom.xml b/yui-parent/pom.xml index a420c18261..c3cf6729a5 100644 --- a/yui-parent/pom.xml +++ b/yui-parent/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-core - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT wicketstuff-yui-parent diff --git a/yui-parent/yui-calendar/pom.xml b/yui-parent/yui-calendar/pom.xml index 81b1720399..c85333a272 100644 --- a/yui-parent/yui-calendar/pom.xml +++ b/yui-parent/yui-calendar/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-yui-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 diff --git a/yui-parent/yui-common/pom.xml b/yui-parent/yui-common/pom.xml index e0954cc241..21021a888c 100644 --- a/yui-parent/yui-common/pom.xml +++ b/yui-parent/yui-common/pom.xml @@ -5,7 +5,7 @@ org.wicketstuff wicketstuff-yui-parent - 7.5.0-SNAPSHOT + 7.0-SNAPSHOT 4.0.0 From 5c0691b8bacd595e59f92b00efdfa17c85324187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Go=CC=88tz?= Date: Mon, 5 Sep 2016 13:12:30 +0200 Subject: [PATCH 016/139] [select2] make AbstractSelect2Choice public --- .../java/org/wicketstuff/select2/AbstractSelect2Choice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java index 4c26d3a614..dde2567b23 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java @@ -49,7 +49,7 @@ * type of model object * @author igor */ -abstract class AbstractSelect2Choice extends AbstractTextComponent implements IResourceListener +public abstract class AbstractSelect2Choice extends AbstractTextComponent implements IResourceListener { private static final long serialVersionUID = 1L; From 85e4803133849e1bdbe2efe411c993609271bb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Go=CC=88tz?= Date: Mon, 5 Sep 2016 13:43:31 +0200 Subject: [PATCH 017/139] [select2] Prevent Nullpointer --- .../java/org/wicketstuff/select2/AbstractSelect2Choice.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java index dde2567b23..49f96590f7 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java @@ -287,7 +287,7 @@ protected void onConfigure() } else if (isAjax()) { - getSettings().getAjax().setUrl(urlFor(IResourceListener.INTERFACE, null)); + getSettings().getAjax(true).setUrl(urlFor(IResourceListener.INTERFACE, null)); } } From 7274fbc690a18ad805b177e6e730f9bea3f41100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Go=CC=88tz?= Date: Mon, 5 Sep 2016 23:31:44 +0200 Subject: [PATCH 018/139] [select2] Automatically include i18n resource file, based on configured language --- .../select2/AbstractSelect2Choice.java | 6 +++++ .../Select2LanguageResourceReference.java | 20 +++++++++++++++ .../select2/Select2ResourcesBehavior.java | 19 -------------- .../org/wicketstuff/select2/Settings.java | 25 ++++++++++++++++--- 4 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java index 49f96590f7..f5168fda8a 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/AbstractSelect2Choice.java @@ -28,6 +28,7 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.form.AbstractTextComponent; import org.apache.wicket.markup.html.form.FormComponent; @@ -118,11 +119,16 @@ public AbstractSelect2Choice(String id, IModel model, ChoiceProvider provi public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); + // render theme related resources if any if(settings.getTheme() != null) { settings.getTheme().renderHead(component, response); } + + // include i18n resource file + response.render(JavaScriptHeaderItem.forReference( + new Select2LanguageResourceReference(settings.getLanguage()))); } }); setOutputMarkupId(true); diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java new file mode 100644 index 0000000000..ba65346c46 --- /dev/null +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java @@ -0,0 +1,20 @@ +package org.wicketstuff.select2; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; + +/** + * {@link JavaScriptResourceReference} for a select2 i18n file, + * please see i18n resources folder for supported languages. + * + * @author Tom Götz (tom@decoded.de) + */ +class Select2LanguageResourceReference extends JavaScriptResourceReference { + + /** + * @param language code to load + */ + Select2LanguageResourceReference(String language) { + super(Select2LanguageResourceReference.class, String.format("res/js/i18n/%s.js", language)); + } + +} diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2ResourcesBehavior.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2ResourcesBehavior.java index 1422a09426..68cb517405 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2ResourcesBehavior.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2ResourcesBehavior.java @@ -12,16 +12,12 @@ */ package org.wicketstuff.select2; -import java.net.URL; - import org.apache.wicket.Application; import org.apache.wicket.Component; -import org.apache.wicket.Session; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import org.apache.wicket.request.resource.JavaScriptResourceReference; /** * Adds various resources needed by Select2 such as JavaScript and CSS. Which resources are added is @@ -60,20 +56,5 @@ public void renderHead(Component component, IHeaderResponse response) { response.render(CssHeaderItem.forReference(settings.getCssReference())); } - //i18n - try - { - String name = String.format("res/js/i18n/%s.js", Session.get().getLocale().toLanguageTag()); - URL lang = getClass().getResource(name); - if (lang != null) - { - //localization found - response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(getClass(), name))); - } - } - catch (Exception e) - { - //no-op - } } } diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java index 340ec868d6..aaccb4fb50 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java @@ -22,6 +22,8 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.wicketstuff.select2.json.Json; +import static org.apache.wicket.util.string.Strings.defaultIfEmpty; + /** * Select2 settings. Refer to the Select2 documentation for what these options mean. * @@ -42,10 +44,13 @@ public static class Widths public static String ELEMENT = "element"; } + // language code (e.g. "en", "de", "fr", ...) + private String language; + private Integer minimumInputLength, minimumResultsForSearch; private Integer maximumSelectionLength; - private Object placeholder; - private boolean allowClear; + private Object placeholder; // ok + private boolean allowClear; // ok private boolean multiple; private boolean closeOnSelect; private String id, matcher, tokenizer; @@ -120,9 +125,11 @@ public CharSequence toJson() Json.writeFunction(writer, "data", data); Json.writeObject(writer, "tags", tags); Json.writeFunction(writer, "createTag", createTag); - writer.key("language").value(Session.get().getLocale().toLanguageTag()); - writer.endObject(); + // Set language + writer.key("language").value(getLanguage()); + + writer.endObject(); return writer.toString(); } catch (JSONException e) @@ -513,4 +520,14 @@ public void setMountPath(String mountPath) { this.mountPath = mountPath; } + + public String getLanguage() { + return defaultIfEmpty(language, Session.get().getLocale().getLanguage()); + } + + public Settings setLanguage(String language) { + this.language = language; + return this; + } + } From b6e916b7d6c9d92c1dc0715bbef8c5a427cadcfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Go=CC=88tz?= Date: Tue, 6 Sep 2016 08:19:17 +0200 Subject: [PATCH 019/139] [select2] Adding check if configured/requested i18n file exists (with fallback to "en") --- .../Select2LanguageResourceReference.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java index ba65346c46..ce805c5f09 100644 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Select2LanguageResourceReference.java @@ -10,11 +10,33 @@ */ class Select2LanguageResourceReference extends JavaScriptResourceReference { + private static final String resourceName = "res/js/i18n/%s.js"; + private static final String defaultLanguage = "en"; + /** - * @param language code to load + * @param language i18n file to load (e.g. "en", "de", "fr" ...) */ Select2LanguageResourceReference(String language) { - super(Select2LanguageResourceReference.class, String.format("res/js/i18n/%s.js", language)); + super(Select2LanguageResourceReference.class, getResourceName(language)); + } + + /** + * Returns the resource name of the i18n file, uses a fallback to defaultLanguage + * if requested resource file does not exist + * + * @param language i18n file to load + * @return resource name + */ + private static String getResourceName(String language) { + try { + String name = String.format(resourceName, language); + if (Select2LanguageResourceReference.class.getResource(name) != null) { + return name; + } + } catch (Exception ignore) { + // noop + } + return String.format(resourceName, defaultLanguage); } } From a67bf299709f0cac2ed722f7274d17d8b1dc14d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Go=CC=88tz?= Date: Tue, 6 Sep 2016 08:48:00 +0200 Subject: [PATCH 020/139] [select2] Removing unnecessary comments --- .../src/main/java/org/wicketstuff/select2/Settings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java index aaccb4fb50..29350b5032 100755 --- a/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java +++ b/select2-parent/select2/src/main/java/org/wicketstuff/select2/Settings.java @@ -49,8 +49,8 @@ public static class Widths private Integer minimumInputLength, minimumResultsForSearch; private Integer maximumSelectionLength; - private Object placeholder; // ok - private boolean allowClear; // ok + private Object placeholder; + private boolean allowClear; private boolean multiple; private boolean closeOnSelect; private String id, matcher, tokenizer; From 1b907baec83b939bea2094039f13ce812826e69c Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Fri, 9 Sep 2016 17:34:01 +0300 Subject: [PATCH 021/139] sychronize with upstream --- portlet-parent/wicketstuff-portlet/pom.xml | 170 ++++++++++----------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/pom.xml b/portlet-parent/wicketstuff-portlet/pom.xml index 1faa0aa1cd..4802a4500d 100644 --- a/portlet-parent/wicketstuff-portlet/pom.xml +++ b/portlet-parent/wicketstuff-portlet/pom.xml @@ -1,85 +1,85 @@ - - 4.0.0 - - - org.wicketstuff - wicketstuff-portlet-parent - 7.0-SNAPSHOT - - - wicketstuff-portlet - jar - Apache Wicket - Portlet Support - - - - 2.0 - - - - - - - - org.apache.wicket - wicket-core - ${wicket.version} - - - - - - javax.servlet - javax.servlet-api - provided - - - - javax.portlet - portlet-api - ${portlet-api.version} - provided - - - - - ${project.artifactId}-${project.version} - - - - false - src/main/java - - ** - - - **/*.java - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - - true - true - 2.0 - - - - - + + 4.0.0 + + + org.wicketstuff + wicketstuff-portlet-parent + 7.0-SNAPSHOT + + + wicketstuff-portlet + jar + Apache Wicket - Portlet Support + + + + 2.0 + + + + + + + + org.apache.wicket + wicket-core + ${wicket.version} + + + + + + javax.servlet + javax.servlet-api + provided + + + + javax.portlet + portlet-api + ${portlet-api.version} + provided + + + + + ${project.artifactId}-${project.version} + + + + false + src/main/java + + ** + + + **/*.java + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + + true + true + 2.0 + + + + + From 2f930ffb0e24f4990def418e1aa1932803cb2f30 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Fri, 9 Sep 2016 17:40:28 +0300 Subject: [PATCH 022/139] fix for issue "WicketPortlet attempts to modify immutable map #540" --- .../apache/wicket/portlet/WicketPortlet.java | 7 +- .../wicket/portlet/WicketPortletConfig.java | 97 +++++++++++++++++++ 2 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java index 6c987560d9..e9bffd731d 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java @@ -311,10 +311,7 @@ else if (request instanceof ResourceRequest) */ @Override public void init(final PortletConfig config) throws PortletException { - // enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) - config.getContainerRuntimeOptions().put("javax.portlet.actionScopedRequestAttributes", - new String[] { "true", "numberOfCachedScopes", "10" }); - super.init(config); + super.init(new WicketPortletConfig(config)); wicketFilterPath = buildWicketFilterPath(config.getInitParameter(WICKET_FILTER_PATH_PARAM)); String responseBufferFolderPath = config.getInitParameter(RESPONSE_BUFFER_FOLDER_PARAM); @@ -716,4 +713,4 @@ protected void validateDefaultPages(final Map defaultPages) { defaultPages.put(PageType.EDIT, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage); } } -} \ No newline at end of file +} diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java new file mode 100644 index 0000000000..5ebe894f1e --- /dev/null +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java @@ -0,0 +1,97 @@ +package org.apache.wicket.portlet; + +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.ResourceBundle; + +import javax.portlet.PortletConfig; +import javax.portlet.PortletContext; +import javax.xml.namespace.QName; + +/** + * PortletConfig implementation which enables action-scoped request attributes support (see JSR286 specification PLT.10.4.4). + * It fixes the issue "WicketPortlet attempts to modify immutable map #540" + * + * @author Konstantinos Karavitis + * + */ +public class WicketPortletConfig implements PortletConfig { + + private PortletConfig delegate; + private Map containerRuntimeOptions; + + public WicketPortletConfig(PortletConfig config) { + delegate = config; + + Map map = new HashMap(); + //config.getContainerRuntimeOptions() returns an immutable map (see JSR286 specification PLT.6.8 ). + for(Map.Entry entry : config.getContainerRuntimeOptions().entrySet()) { + map.put(entry.getKey(), entry.getValue()); + } + //enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) + map.put("javax.portlet.actionScopedRequestAttributes", + new String[] { "true", "numberOfCachedScopes", "10" }); + + //make the containerRuntimeOptions map an immutable map as the specification requires (see JSR286 specification PLT.6.8 ). + containerRuntimeOptions = Collections.unmodifiableMap(map); + } + + @Override + public String getPortletName() { + return delegate.getPortletName(); + } + + @Override + public PortletContext getPortletContext() { + return delegate.getPortletContext(); + } + + @Override + public ResourceBundle getResourceBundle(Locale locale) { + return delegate.getResourceBundle(locale); + } + + @Override + public String getInitParameter(String name) { + return delegate.getInitParameter(name); + } + + @Override + public Enumeration getInitParameterNames() { + return delegate.getInitParameterNames(); + } + + @Override + public Enumeration getPublicRenderParameterNames() { + return delegate.getPublicRenderParameterNames(); + } + + @Override + public String getDefaultNamespace() { + return delegate.getDefaultNamespace(); + } + + @Override + public Enumeration getPublishingEventQNames() { + return delegate.getPublishingEventQNames(); + } + + @Override + public Enumeration getProcessingEventQNames() { + return delegate.getProcessingEventQNames(); + } + + @Override + public Enumeration getSupportedLocales() { + return delegate.getSupportedLocales(); + } + + @Override + public Map getContainerRuntimeOptions() { + return containerRuntimeOptions; + } + +} From 48c28ad4cfd98e4d0e54eb7de38674abf214b9f9 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Sun, 11 Sep 2016 16:54:20 +0300 Subject: [PATCH 023/139] fix for issue #540 (WicketPortlet attempts to modify immutable map) --- .../apache/wicket/portlet/WicketPortletConfig.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java index 5ebe894f1e..549721e9b4 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java @@ -25,18 +25,15 @@ public class WicketPortletConfig implements PortletConfig { public WicketPortletConfig(PortletConfig config) { delegate = config; - - Map map = new HashMap(); - //config.getContainerRuntimeOptions() returns an immutable map (see JSR286 specification PLT.6.8 ). - for(Map.Entry entry : config.getContainerRuntimeOptions().entrySet()) { - map.put(entry.getKey(), entry.getValue()); - } + //transfer the immutable map that the config.getContainerRuntimeOptions() returns (see JSR286 specification PLT.6.8 ) + //to a temporary modifiable map. + containerRuntimeOptions = new HashMap(config.getContainerRuntimeOptions()); //enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) - map.put("javax.portlet.actionScopedRequestAttributes", + containerRuntimeOptions.put("javax.portlet.actionScopedRequestAttributes", new String[] { "true", "numberOfCachedScopes", "10" }); //make the containerRuntimeOptions map an immutable map as the specification requires (see JSR286 specification PLT.6.8 ). - containerRuntimeOptions = Collections.unmodifiableMap(map); + containerRuntimeOptions = Collections.unmodifiableMap(containerRuntimeOptions); } @Override From 73eca61b1e7bd94f8f38d17d824f71353650060b Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 15:11:25 +0200 Subject: [PATCH 024/139] Disabled tests for progressbar module in order to allow CI --- .travis.yml | 2 +- progressbar-parent/pom.xml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5e65bfdea5..873397d7cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,4 @@ script: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && DEPLOY_OR_TEST=deploy' - "echo DEPLOY_OR_TEST=$DEPLOY_OR_TEST" - "cp ./config/toolchains.xml $HOME/.m2" - - "mvn -s sonatype-settings.xml clean $DEPLOY_OR_TEST -Dsource.skip=true -B -V --quiet" + - "mvn -s sonatype-settings.xml clean $DEPLOY_OR_TEST -P SKIP_MODULE_TESTS -Dsource.skip=true -B -V --quiet" diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index ee58f7fc79..ec5b93c109 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -22,6 +22,9 @@ progressbar-spring progressbar-example + + false + @@ -30,6 +33,15 @@ hlubek at users.sf.net + + + + SKIP_MODULE_TESTS + + true + + + @@ -49,4 +61,15 @@ junit + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skip.module.tests} + + + + From e73ab3803878675cbc176e15d80ade7cfa9f124e Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 15:18:37 +0200 Subject: [PATCH 025/139] Fix for #544 --- .../rest/resource/AbstractRestResource.java | 7 +++++-- .../visitor/ScoreMethodAndExtractPathVars.java | 3 +-- .../org/wicketstuff/rest/RestResourcesTest.java | 9 +++++---- .../rest/resource/RegExpRestResource.java | 15 +++++++++++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/AbstractRestResource.java b/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/AbstractRestResource.java index 48e124c5b4..7237fefdb8 100644 --- a/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/AbstractRestResource.java +++ b/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/AbstractRestResource.java @@ -430,8 +430,10 @@ private ScoreMethodAndExtractPathVars selectMostSuitedMethod(AttributesWrapper a // no method mapped if (mappedMethodsCandidates == null || mappedMethodsCandidates.size() == 0) + { return null; - + } + /** * To select the "best" method, a score is assigned to every mapped method. To calculate the * score method calculateScore is executed for every segment. @@ -453,7 +455,8 @@ private ScoreMethodAndExtractPathVars selectMostSuitedMethod(AttributesWrapper a } } - int methodScore = scoredMethod.getScore(); + int methodScore = scoredMethod.isSegmentValid() ? + scoredMethod.getScore() : -1; if (methodScore >= highestScore) { diff --git a/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/urlsegments/visitor/ScoreMethodAndExtractPathVars.java b/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/urlsegments/visitor/ScoreMethodAndExtractPathVars.java index 67e0d234d9..d87d60d85e 100644 --- a/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/urlsegments/visitor/ScoreMethodAndExtractPathVars.java +++ b/wicketstuff-restannotations-parent/restannotations/src/main/java/org/wicketstuff/rest/resource/urlsegments/visitor/ScoreMethodAndExtractPathVars.java @@ -57,14 +57,13 @@ public class ScoreMethodAndExtractPathVars implements ISegmentVisitor private int score; /** Indicates if the last segment was valid for the current method URL. */ - private boolean isSegmentValid = false; + private boolean isSegmentValid = true; public ScoreMethodAndExtractPathVars(MethodMappingInfo methodInfo, PageParameters pageParameters) { this.methodInfo = methodInfo; this.pageParameters = pageParameters; this.pathVariables = new LinkedHashMap<>(); - } @Override diff --git a/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/RestResourcesTest.java b/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/RestResourcesTest.java index 430dbec5ef..035d055435 100644 --- a/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/RestResourcesTest.java +++ b/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/RestResourcesTest.java @@ -23,10 +23,6 @@ import java.io.StringWriter; import java.util.Collections; -import javax.servlet.http.Cookie; -import javax.xml.bind.JAXB; -import javax.xml.transform.stream.StreamResult; - import org.apache.wicket.Session; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.ajax.json.JSONObject; @@ -46,6 +42,10 @@ import org.wicketstuff.rest.utils.test.BufferedMockRequest; import org.wicketstuff.rest.utils.wicket.bundle.DefaultBundleResolver; +import javax.servlet.http.Cookie; +import javax.xml.bind.JAXB; +import javax.xml.transform.stream.StreamResult; + /** * Simple test using the WicketTester @@ -170,6 +170,7 @@ public void testJsonSerializedResponse() @Test public void testMethodNotFound() throws Exception { + tester.getRequest().setMethod("GET"); tester.executeUrl("./api2/foo"); String response = tester.getLastResponseAsString(); diff --git a/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/resource/RegExpRestResource.java b/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/resource/RegExpRestResource.java index b36bcae445..07f3b44844 100644 --- a/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/resource/RegExpRestResource.java +++ b/wicketstuff-restannotations-parent/restannotations/src/test/java/org/wicketstuff/rest/resource/RegExpRestResource.java @@ -20,6 +20,7 @@ import org.apache.wicket.util.lang.Args; import org.wicketstuff.rest.annotations.MethodMapping; import org.wicketstuff.rest.annotations.parameters.CookieParam; +import org.wicketstuff.rest.contenthandling.mimetypes.RestMimeTypes; import org.wicketstuff.rest.contenthandling.webserialdeserial.JsonTestWebSerialDeserial; public class RegExpRestResource extends RestResourceFullAnnotated @@ -45,4 +46,18 @@ public void testLogMessage(@CookieParam("credential") String credential, int day Args.notNull(year, "year"); Args.notNull(message, "message"); } + + /*Map two one-segment methods*/ + @MethodMapping(value = "/oneget", produces = RestMimeTypes.TEXT_PLAIN) + public String oneGet() + { + return "oneGet"; + } + + @MethodMapping(value = "/twoget", produces = RestMimeTypes.TEXT_PLAIN) + public String twoGet() + { + return "twoGet"; + } + /* END MAPPING */ } From 2eb5f3e0db06ab0cbad2a6ed43aa25e7597507ec Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 15:39:07 +0200 Subject: [PATCH 026/139] "Skip test" profile moved to the main pom --- progressbar-parent/pom.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index ec5b93c109..f9a8ce1fae 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -22,9 +22,6 @@ progressbar-spring progressbar-example - - false - @@ -32,16 +29,7 @@ hlubek hlubek at users.sf.net - - - - - SKIP_MODULE_TESTS - - true - - - + From 163746cd3016f37e1a2ce064a30f60022a2ad1af Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 16:02:47 +0200 Subject: [PATCH 027/139] Skip tests for right project --- async-tasks-parent/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/async-tasks-parent/pom.xml b/async-tasks-parent/pom.xml index 4d3c6773dc..2387e6695a 100644 --- a/async-tasks-parent/pom.xml +++ b/async-tasks-parent/pom.xml @@ -67,4 +67,15 @@ testng + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skip.module.tests} + + + + From 7572720aac129f034137eabded38c3f2f942c93d Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 16:17:01 +0200 Subject: [PATCH 028/139] "skip test" moved away from wrong project --- pom.xml | 8 ++++++++ progressbar-parent/pom.xml | 13 +------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index d51d289cec..504e110532 100644 --- a/pom.xml +++ b/pom.xml @@ -219,6 +219,12 @@ + + SKIP_MODULE_TESTS + + true + + @@ -268,6 +274,8 @@ 3.1 2.1 2.11.8 + + false diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index f9a8ce1fae..3a539cbc16 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -48,16 +48,5 @@ junit junit - - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skip.module.tests} - - - - + From 1bc6609fd50e1e764e99a23f05ed67334339a4bc Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 18:19:39 +0200 Subject: [PATCH 029/139] Revert ""skip test" moved away from wrong project" This reverts commit 7572720aac129f034137eabded38c3f2f942c93d. --- pom.xml | 8 -------- progressbar-parent/pom.xml | 13 ++++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 504e110532..d51d289cec 100644 --- a/pom.xml +++ b/pom.xml @@ -219,12 +219,6 @@ - - SKIP_MODULE_TESTS - - true - - @@ -274,8 +268,6 @@ 3.1 2.1 2.11.8 - - false diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index 3a539cbc16..f9a8ce1fae 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -48,5 +48,16 @@ junit junit - + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${skip.module.tests} + + + + From 60496ee3342c8461cf002d0ff85d8c9dbdb2d485 Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 18:19:49 +0200 Subject: [PATCH 030/139] Revert "Skip tests for right project" This reverts commit 163746cd3016f37e1a2ce064a30f60022a2ad1af. --- async-tasks-parent/pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/async-tasks-parent/pom.xml b/async-tasks-parent/pom.xml index 2387e6695a..4d3c6773dc 100644 --- a/async-tasks-parent/pom.xml +++ b/async-tasks-parent/pom.xml @@ -67,15 +67,4 @@ testng - - - - org.apache.maven.plugins - maven-surefire-plugin - - ${skip.module.tests} - - - - From 07c015db5ec97df6f8fef97d223b42faa8fc011d Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Mon, 19 Sep 2016 18:19:54 +0200 Subject: [PATCH 031/139] Revert ""Skip test" profile moved to the main pom" This reverts commit 2eb5f3e0db06ab0cbad2a6ed43aa25e7597507ec. --- progressbar-parent/pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/progressbar-parent/pom.xml b/progressbar-parent/pom.xml index f9a8ce1fae..ec5b93c109 100644 --- a/progressbar-parent/pom.xml +++ b/progressbar-parent/pom.xml @@ -22,6 +22,9 @@ progressbar-spring progressbar-example + + false + @@ -29,7 +32,16 @@ hlubek hlubek at users.sf.net - + + + + + SKIP_MODULE_TESTS + + true + + + From 184b7f387dadd429be1bf0794dba4d6abe8d98c7 Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Wed, 21 Sep 2016 13:13:53 +0200 Subject: [PATCH 032/139] Removed SKIP_MODULE_TEST profile --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 873397d7cf..5e65bfdea5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,4 +40,4 @@ script: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && DEPLOY_OR_TEST=deploy' - "echo DEPLOY_OR_TEST=$DEPLOY_OR_TEST" - "cp ./config/toolchains.xml $HOME/.m2" - - "mvn -s sonatype-settings.xml clean $DEPLOY_OR_TEST -P SKIP_MODULE_TESTS -Dsource.skip=true -B -V --quiet" + - "mvn -s sonatype-settings.xml clean $DEPLOY_OR_TEST -Dsource.skip=true -B -V --quiet" From c30fa0b0f8bf3404a8bc03d55a0166a244cbf89a Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Wed, 21 Sep 2016 15:43:44 +0200 Subject: [PATCH 033/139] Fix for critical sections in ProgressButtonTest --- .../wicketstuff/async/components/ProgressButtonTest.java | 7 ++++++- .../java/org/wicketstuff/async/components/TestPage.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java index 7cb7babcec..fb4669d8f2 100644 --- a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java +++ b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java @@ -64,6 +64,7 @@ public void testButtonAjax() throws Exception { @Override public void run() { result[0] = true; + page.countDownLatch(); } }); @@ -71,6 +72,7 @@ public void run() { tester.assertRenderedPage(TestPage.class); tester.executeAjaxEvent("form:button", "click"); + page.waitForTaskToComplete(); executeRefresh(500L); assertTrue(result[0]); @@ -90,7 +92,9 @@ public void testException() throws Exception { FormTester formTester = tester.newFormTester("form"); formTester.submit("button"); - + + page.waitForTaskToComplete(); + assertTrue(page.isTaskStart()); assertFalse(page.isTaskCancel()); } @@ -104,6 +108,7 @@ public void testExceptionAjax() throws Exception { tester.assertRenderedPage(TestPage.class); tester.executeAjaxEvent("form:button", "click"); + page.waitForTaskToComplete(); executeRefresh(500L); assertTrue(page.isTaskStart()); diff --git a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java index 248b4b42b0..a7ec6e6fad 100644 --- a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java +++ b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java @@ -31,21 +31,25 @@ public TestPage() { @Override protected void onTaskStart(AjaxRequestTarget ajaxRequestTarget) { taskStart = true; + countDownLatch(); } @Override protected void onTaskSuccess(AjaxRequestTarget ajaxRequestTarget) { taskSuccess = true; + countDownLatch(); } @Override protected void onTaskCancel(AjaxRequestTarget ajaxRequestTarget) { taskCancel = true; + countDownLatch(); } @Override protected void onTaskError(AjaxRequestTarget ajaxRequestTarget) { taskError = true; + countDownLatch(); } }; From dfcd0bcf5747c82e969ff02a1a6555637c22fbd4 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Thu, 22 Sep 2016 16:36:50 +0300 Subject: [PATCH 034/139] #546 fix: convert the absolute rendered urls to root-relative urls --- .../wicket/portlet/PortletUrlRenderer.java | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java index ba6e1d3e54..1b582c9826 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java @@ -3,9 +3,11 @@ import javax.portlet.PortletRequest; import org.apache.wicket.request.Request; +import org.apache.wicket.request.Url; import org.apache.wicket.request.UrlRenderer; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.PrependingStringBuffer; +import org.apache.wicket.util.string.Strings; /** *

{@link UrlRenderer} for Portlet Applications.

@@ -34,6 +36,10 @@ */ public class PortletUrlRenderer extends UrlRenderer { + + + private Request request; + /** * @param request * @@ -43,6 +49,7 @@ public class PortletUrlRenderer extends UrlRenderer public PortletUrlRenderer(Request request) { super(request); + this.request = request; PortletRequest portletRequest = ThreadPortletContext.getPortletRequest(); String lifecyclePhase = (String) portletRequest.getAttribute(PortletRequest.LIFECYCLE_PHASE); @@ -67,4 +74,50 @@ public String renderContextRelativeUrl(String url) return buffer.toString(); } + + /** + * Renders the Url + * + * @param url + * @return Url rendered as string + */ + public String renderUrl(final Url url) + { + String renderedUrl = super.renderUrl(url); + + Url absoluteUrl = Url.parse(renderedUrl); + Url clientUrl = request.getClientUrl(); + if (!shouldRedirectToExternalUrl(absoluteUrl, clientUrl)) { + if (absoluteUrl.getProtocol() != null) { + renderedUrl = renderedUrl.replace(absoluteUrl.getProtocol() + "://", "/"); + } + if (absoluteUrl.getHost() != null) { + renderedUrl = renderedUrl.replace("/" + absoluteUrl.getHost(), "/"); + } + if (absoluteUrl.getPort() != null) { + renderedUrl = renderedUrl.replace("/:" + absoluteUrl.getPort(), "/"); + } + renderedUrl = renderedUrl.replace("//", "/"); + } + + return renderedUrl; + } + + private boolean shouldRedirectToExternalUrl(Url url, Url clientUrl) + { + if (!Strings.isEmpty(url.getProtocol()) && !url.getProtocol().equals(clientUrl.getProtocol())) + { + return true; + } + if (!Strings.isEmpty(url.getHost()) && !url.getHost().equals(clientUrl.getHost())) + { + return true; + } + if ((url.getPort() != null) && !url.getPort().equals(clientUrl.getPort())) + { + return true; + } + + return false; + } } \ No newline at end of file From eed90729cbc111ce0a672f9d720f7c5a4052c2f4 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Thu, 22 Sep 2016 20:37:14 +0300 Subject: [PATCH 035/139] use the wicket-utils String.replaceAll instead of String#replace(CharSequence, CharSequence) --- .../apache/wicket/portlet/PortletUrlRenderer.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java index 1b582c9826..a7af2fce13 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java @@ -83,24 +83,25 @@ public String renderContextRelativeUrl(String url) */ public String renderUrl(final Url url) { - String renderedUrl = super.renderUrl(url); + CharSequence renderedUrl = super.renderUrl(url); Url absoluteUrl = Url.parse(renderedUrl); Url clientUrl = request.getClientUrl(); if (!shouldRedirectToExternalUrl(absoluteUrl, clientUrl)) { if (absoluteUrl.getProtocol() != null) { - renderedUrl = renderedUrl.replace(absoluteUrl.getProtocol() + "://", "/"); + renderedUrl = Strings.replaceAll(renderedUrl, absoluteUrl.getProtocol() + "://", "/"); } if (absoluteUrl.getHost() != null) { - renderedUrl = renderedUrl.replace("/" + absoluteUrl.getHost(), "/"); + renderedUrl = Strings.replaceAll(renderedUrl, "/" + absoluteUrl.getHost(), "/"); } if (absoluteUrl.getPort() != null) { - renderedUrl = renderedUrl.replace("/:" + absoluteUrl.getPort(), "/"); + renderedUrl = Strings.replaceAll(renderedUrl, "/:" + absoluteUrl.getPort(), "/"); + } - renderedUrl = renderedUrl.replace("//", "/"); + renderedUrl = Strings.replaceAll(renderedUrl, "//", "/"); } - return renderedUrl; + return renderedUrl.toString(); } private boolean shouldRedirectToExternalUrl(Url url, Url clientUrl) From 1c957fcd7b09437896ca4b0c65c07bb304442941 Mon Sep 17 00:00:00 2001 From: Andrea Del Bene Date: Thu, 22 Sep 2016 22:38:34 +0200 Subject: [PATCH 036/139] Revert "Fix for critical sections in ProgressButtonTest" This reverts commit c30fa0b0f8bf3404a8bc03d55a0166a244cbf89a. --- .../wicketstuff/async/components/ProgressButtonTest.java | 7 +------ .../java/org/wicketstuff/async/components/TestPage.java | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java index fb4669d8f2..7cb7babcec 100644 --- a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java +++ b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/ProgressButtonTest.java @@ -64,7 +64,6 @@ public void testButtonAjax() throws Exception { @Override public void run() { result[0] = true; - page.countDownLatch(); } }); @@ -72,7 +71,6 @@ public void run() { tester.assertRenderedPage(TestPage.class); tester.executeAjaxEvent("form:button", "click"); - page.waitForTaskToComplete(); executeRefresh(500L); assertTrue(result[0]); @@ -92,9 +90,7 @@ public void testException() throws Exception { FormTester formTester = tester.newFormTester("form"); formTester.submit("button"); - - page.waitForTaskToComplete(); - + assertTrue(page.isTaskStart()); assertFalse(page.isTaskCancel()); } @@ -108,7 +104,6 @@ public void testExceptionAjax() throws Exception { tester.assertRenderedPage(TestPage.class); tester.executeAjaxEvent("form:button", "click"); - page.waitForTaskToComplete(); executeRefresh(500L); assertTrue(page.isTaskStart()); diff --git a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java index a7ec6e6fad..248b4b42b0 100644 --- a/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java +++ b/async-tasks-parent/async-tasks-impl/src/test/java/org/wicketstuff/async/components/TestPage.java @@ -31,25 +31,21 @@ public TestPage() { @Override protected void onTaskStart(AjaxRequestTarget ajaxRequestTarget) { taskStart = true; - countDownLatch(); } @Override protected void onTaskSuccess(AjaxRequestTarget ajaxRequestTarget) { taskSuccess = true; - countDownLatch(); } @Override protected void onTaskCancel(AjaxRequestTarget ajaxRequestTarget) { taskCancel = true; - countDownLatch(); } @Override protected void onTaskError(AjaxRequestTarget ajaxRequestTarget) { taskError = true; - countDownLatch(); } }; From f3e6c47f679a11b27d230e31d185e32fff47ef6a Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Mon, 24 Oct 2016 15:36:56 +0300 Subject: [PATCH 037/139] Remove the action-scoped request attributes support usage and use render parameters for transferring the wicket redirect url from action phase to render phase. --- .../apache/wicket/portlet/WicketPortlet.java | 11 +-- .../wicket/portlet/WicketPortletConfig.java | 94 ------------------- 2 files changed, 4 insertions(+), 101 deletions(-) delete mode 100644 portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java index e9bffd731d..01875678eb 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java @@ -293,10 +293,7 @@ else if (request instanceof ResourceRequest) // try to lookup the passed in wicket url parameter, suffixed with // the portlet mode String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + request.getPortletMode().toString(); - String redirectUrl = request.getParameter(redirectUrlKey); - // if the wicket url is not in request parameters try to lookup into the action scoped - // attributes. - wicketURL = redirectUrl == null ? (String)request.getAttribute(redirectUrlKey) : redirectUrl; + wicketURL = request.getParameter(redirectUrlKey); } // if the wicketURL could not be retrieved, return the url for the @@ -311,7 +308,7 @@ else if (request instanceof ResourceRequest) */ @Override public void init(final PortletConfig config) throws PortletException { - super.init(new WicketPortletConfig(config)); + super.init(config); wicketFilterPath = buildWicketFilterPath(config.getInitParameter(WICKET_FILTER_PATH_PARAM)); String responseBufferFolderPath = config.getInitParameter(RESPONSE_BUFFER_FOLDER_PARAM); @@ -371,8 +368,8 @@ protected void processActionResponseState(String wicketURL, final PortletRequest if (redirectLocationUrl.startsWith(wicketFilterPath)) { final String portletMode = request.getPortletMode().toString(); final String redirectUrlKey = WICKET_URL_PORTLET_PARAMETER + portletMode; - // put the redirect location into the "_wuview" action scoped request attribute - request.setAttribute(redirectUrlKey, redirectLocationUrl); + // put the redirect location into the "_wuview" render parameter + response.setRenderParameter(redirectUrlKey, redirectLocationUrl); } else response.sendRedirect(redirectLocationUrl); diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java deleted file mode 100644 index 549721e9b4..0000000000 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortletConfig.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.apache.wicket.portlet; - -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.ResourceBundle; - -import javax.portlet.PortletConfig; -import javax.portlet.PortletContext; -import javax.xml.namespace.QName; - -/** - * PortletConfig implementation which enables action-scoped request attributes support (see JSR286 specification PLT.10.4.4). - * It fixes the issue "WicketPortlet attempts to modify immutable map #540" - * - * @author Konstantinos Karavitis - * - */ -public class WicketPortletConfig implements PortletConfig { - - private PortletConfig delegate; - private Map containerRuntimeOptions; - - public WicketPortletConfig(PortletConfig config) { - delegate = config; - //transfer the immutable map that the config.getContainerRuntimeOptions() returns (see JSR286 specification PLT.6.8 ) - //to a temporary modifiable map. - containerRuntimeOptions = new HashMap(config.getContainerRuntimeOptions()); - //enable action-scoped request attributes support (see JSR286 specification PLT.10.4.4) - containerRuntimeOptions.put("javax.portlet.actionScopedRequestAttributes", - new String[] { "true", "numberOfCachedScopes", "10" }); - - //make the containerRuntimeOptions map an immutable map as the specification requires (see JSR286 specification PLT.6.8 ). - containerRuntimeOptions = Collections.unmodifiableMap(containerRuntimeOptions); - } - - @Override - public String getPortletName() { - return delegate.getPortletName(); - } - - @Override - public PortletContext getPortletContext() { - return delegate.getPortletContext(); - } - - @Override - public ResourceBundle getResourceBundle(Locale locale) { - return delegate.getResourceBundle(locale); - } - - @Override - public String getInitParameter(String name) { - return delegate.getInitParameter(name); - } - - @Override - public Enumeration getInitParameterNames() { - return delegate.getInitParameterNames(); - } - - @Override - public Enumeration getPublicRenderParameterNames() { - return delegate.getPublicRenderParameterNames(); - } - - @Override - public String getDefaultNamespace() { - return delegate.getDefaultNamespace(); - } - - @Override - public Enumeration getPublishingEventQNames() { - return delegate.getPublishingEventQNames(); - } - - @Override - public Enumeration getProcessingEventQNames() { - return delegate.getProcessingEventQNames(); - } - - @Override - public Enumeration getSupportedLocales() { - return delegate.getSupportedLocales(); - } - - @Override - public Map getContainerRuntimeOptions() { - return containerRuntimeOptions; - } - -} From 18a60f13e6b337061e03dbc36e317e428cdf06bf Mon Sep 17 00:00:00 2001 From: Sven Meier Date: Tue, 25 Oct 2016 15:29:47 +0200 Subject: [PATCH 038/139] =?UTF-8?q?issue=20554:=20allow=20evaluation=20on?= =?UTF-8?q?=20dynamic=20proxies=20,=20a=20dynamic=20prox=C3=BD=20cannot=20?= =?UTF-8?q?be=20subclassed,=20but=20its=20interfaces=20are=20usually=20suf?= =?UTF-8?q?ficient=20-=20thus=20remove=20unneeded=20cast?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lazymodel/reflect/Evaluation.java | 2 +- .../wicketstuff/lazymodel/LazyModelTest.java | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java index 43e1ac6dac..f0dd69f3b2 100644 --- a/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java +++ b/wicketstuff-lazymodel/src/main/java/org/wicketstuff/lazymodel/reflect/Evaluation.java @@ -136,7 +136,7 @@ public Object proxy() { return null; } - return clazz.cast(proxyFactory.createInstance(proxyClass, this)); + return proxyFactory.createInstance(proxyClass, this); } /** diff --git a/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java index 2f4a2aa981..dcd064f60b 100644 --- a/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java +++ b/wicketstuff-lazymodel/src/test/java/org/wicketstuff/lazymodel/LazyModelTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.wicketstuff.lazymodel.LazyModel.from; @@ -25,6 +26,9 @@ import static org.wicketstuff.lazymodel.LazyModel.path; import java.io.Serializable; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -967,6 +971,23 @@ public void propertyReflectionAwareModelNoProperty() throws Exception { assertNull(model.getPropertySetter()); } + @Test + public void fromProxy() throws Exception { + final List list = new ArrayList(); + + @SuppressWarnings("unchecked") + I proxy = (I) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{I.class}, new InvocationHandler() { + @Override + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + return list; + } + }); + + LazyModel> model = model(from(proxy).getTs()); + + assertSame(list, model.getObject()); + } + public static class A implements Serializable { B b; From 1b1483bd32405b3249e30cc443d262d9361e8364 Mon Sep 17 00:00:00 2001 From: Yevgen Kulik Date: Mon, 24 Oct 2016 19:11:26 +0300 Subject: [PATCH 039/139] fix missing upload.min.js needed for production mode --- .../contrib/tinymce4/tinymce/plugins/imageupload/plugin.min.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/tinymce/plugins/imageupload/plugin.min.js diff --git a/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/tinymce/plugins/imageupload/plugin.min.js b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/tinymce/plugins/imageupload/plugin.min.js new file mode 100644 index 0000000000..9099199af2 --- /dev/null +++ b/tinymce4-parent/tinymce4/src/main/java/wicket/contrib/tinymce4/tinymce/plugins/imageupload/plugin.min.js @@ -0,0 +1 @@ +tinymce.PluginManager.add("imageupload",function(a){a.addButton("imageupload",{icon:"image",text:"Image upload",tooltip:"Upload an image",onclick:function(){showImageUploadDialog()}})}); From c5886b7279a448fd33e5f35522d3815877287be0 Mon Sep 17 00:00:00 2001 From: kkaravitis Date: Thu, 27 Oct 2016 16:08:37 +0300 Subject: [PATCH 040/139] fix for issue #555, the url modification is prevented if the url is a portlet one. --- .../wicket/portlet/PortletRequestMapper.java | 524 +++++++++--------- .../wicket/portlet/PortletUrlRenderer.java | 6 + .../apache/wicket/portlet/WicketPortlet.java | 1 - 3 files changed, 272 insertions(+), 259 deletions(-) diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletRequestMapper.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletRequestMapper.java index ebe00e073a..ff5f1c6a3d 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletRequestMapper.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletRequestMapper.java @@ -1,258 +1,266 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.portlet; - -import java.util.Iterator; -import java.util.Map; - -import javax.portlet.MimeResponse; -import javax.portlet.PortletResponse; -import javax.portlet.PortletURL; -import javax.portlet.ResourceURL; -import javax.servlet.http.HttpServletRequest; - -import org.apache.wicket.Application; -import org.apache.wicket.IResourceListener; -import org.apache.wicket.RequestListenerInterface; -import org.apache.wicket.SystemMapper; -import org.apache.wicket.behavior.IBehaviorListener; -import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; -import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; -import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; -import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.core.request.mapper.AbstractComponentMapper; -import org.apache.wicket.portlet.request.mapper.PortletSystemMapper; -import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.request.Request; -import org.apache.wicket.request.Url; -import org.apache.wicket.request.cycle.RequestCycle; -import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; -import org.apache.wicket.request.resource.IResource; -import org.apache.wicket.request.resource.PackageResource; -import org.apache.wicket.request.resource.SharedResourceReference; -import org.apache.wicket.util.crypt.Base64; - -/** - * This class is the default request mapper for portlets. It modifies the - * generated URLs (that are generated by the wrapped SystemMapper) depending on - * the type of the used request handler. Its purpose is to implement all portlet - * related functionality from WebRequestCodingStrategy, that was used in Wicket - * 1.4. - * - * @author Peter Pastrnak - * @author Konstantinos Karavitis - */ -public class PortletRequestMapper extends AbstractComponentMapper { - private SystemMapper systemMapper; - - public PortletRequestMapper(final Application application) { - systemMapper = new PortletSystemMapper(application); - } - - @Override - public IRequestHandler mapRequest(Request request) { - return systemMapper.mapRequest(request); - } - - @Override - public int getCompatibilityScore(Request request) { - return systemMapper.getCompatibilityScore(request); - } - - @Override - public Url mapHandler(IRequestHandler requestHandler) { - Url url = systemMapper.mapHandler(requestHandler); - if (ThreadPortletContext.getPortletRequest() == null || url == null) { - return url; - } - - if (requestHandler instanceof RenderPageRequestHandler) { - if (ThreadPortletContext.isAjax()) { - url = encodeRenderUrl(url, true); - } - } - else if (requestHandler instanceof SharedResourceReference) { - url = encodeSharedResourceUrl(url); - } - else if (requestHandler instanceof ResourceReferenceRequestHandler) { - ResourceReferenceRequestHandler resourceReferenceRequestHandler = (ResourceReferenceRequestHandler) requestHandler; - IResource resource = resourceReferenceRequestHandler.getResource(); - - if (resource instanceof PackageResource) { - url = encodeSharedResourceUrl(url); - } - else { - url = encodeResourceUrl(url); - } - } - else if (requestHandler instanceof BookmarkablePageRequestHandler) { - url = encodeRenderUrl(url, true); - } - //added mapping for request handlers with type of BookmarkableListenerInterfaceRequestHandler. The handling is the same as for handlers of type ListenerInterfaceRequestHandler - else if (requestHandler instanceof ListenerInterfaceRequestHandler || requestHandler instanceof BookmarkableListenerInterfaceRequestHandler) { - RequestListenerInterface listenerInterface; - - if (requestHandler instanceof ListenerInterfaceRequestHandler) { - listenerInterface = ((ListenerInterfaceRequestHandler) requestHandler).getListenerInterface(); - } - else { - listenerInterface = ((BookmarkableListenerInterfaceRequestHandler)requestHandler).getListenerInterface(); - } - - Class listenerClass = listenerInterface.getMethod().getDeclaringClass(); - if ((IResourceListener.class.isAssignableFrom(listenerClass)) || (IBehaviorListener.class.isAssignableFrom(listenerClass))) { - url = encodeResourceUrl(url); - } - else { - url = encodeActionUrl(url, ThreadPortletContext.isAjax()); - } - } - - return url; - } - - private String getQualifiedPath(String path) { - HttpServletRequest request = ThreadPortletContext.getHttpServletRequest(); - return request.getServletPath() + "/" + path; - } - - private Url parseUrl(String urlString) { - Url url = Url.parse(urlString); - - // to avoid UrlRenderer touching the url (shouldRenderAsFull) - url.setProtocol(null); - url.setHost(null); - url.setPort(null); - - return url; - } - - private Url encodeResourceUrl(Url url) { - if (url != null) { - String qualifiedPath = getQualifiedPath(url.toString()); - - PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); - if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { - try { - ResourceURL resourceUrl = ((MimeResponse) portletResponse).createResourceURL(); - resourceUrl.setResourceID(qualifiedPath); - qualifiedPath = resourceUrl.toString(); - - // resource URLs preserve all request render parameters (at - // least for Liferay even all POST parameters), so we have - // to remove all Wicket parameters (that have the portlet - // namespace), otherwise we would have all submited values - // in the URL - int queryStringSeparator = qualifiedPath.indexOf('?'); - if (queryStringSeparator > 0) { - Map parameterMap = Utils.parseQueryString(qualifiedPath.substring(queryStringSeparator + 1)); - - boolean changed = false; - Iterator> it = parameterMap.entrySet().iterator(); - String namespace = ThreadPortletContext.getNamespace(); - while (it.hasNext()) { - if (it.next().getKey().startsWith(namespace)) { - changed = true; - it.remove(); - } - } - if (changed) { - qualifiedPath = qualifiedPath.substring(0, queryStringSeparator) + '?' + Utils.buildQueryString(parameterMap); - } - } - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - url = parseUrl(qualifiedPath); - } - - return url; - } - - private Url encodeSharedResourceUrl(Url url) { - if (url != null) { - Request request = RequestCycle.get().getRequest(); - - StringBuilder urlBuilder = new StringBuilder(); - urlBuilder.append(request.getContextPath()); - urlBuilder.append(request.getFilterPath()); - urlBuilder.append(PortletFilter.SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX); - urlBuilder.append(Base64.encodeBase64URLSafeString(ThreadPortletContext.getWindowID().getBytes())); - urlBuilder.append('/'); - urlBuilder.append(url.toString()); - - url = Url.parse(urlBuilder.toString()); - } - - return url; - } - - private Url encodeActionUrl(Url url, boolean forceActionUrl) { - if ((!forceActionUrl) && (ThreadPortletContext.isResourceRequest())) { - return encodeResourceUrl(url); - } - - if (url != null) { - String qualifiedPath = getQualifiedPath(url.toString()); - - PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); - if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { - try { - PortletURL portletUrl = ((MimeResponse) portletResponse).createActionURL(); - portletUrl.setParameter(WicketPortlet.WICKET_URL_PORTLET_PARAMETER, qualifiedPath); - qualifiedPath = portletUrl.toString(); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - url = parseUrl(qualifiedPath); - } - - return url; - } - - private Url encodeRenderUrl(Url url, boolean forceRenderUrl) { - if ((!forceRenderUrl) && (ThreadPortletContext.isResourceRequest())) { - return encodeResourceUrl(url); - } - - if (url != null) { - String qualifiedPath = getQualifiedPath(url.toString()); - - PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); - if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { - try { - PortletURL portletUrl = ((MimeResponse) portletResponse).createRenderURL(); - portletUrl.setParameter(WicketPortlet.WICKET_URL_PORTLET_PARAMETER + ThreadPortletContext.getPortletMode().toString(), qualifiedPath); - qualifiedPath = portletUrl.toString(); - } - catch (Exception e) { - throw new RuntimeException(e); - } - } - - url = parseUrl(qualifiedPath); - } - - return url; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.portlet; + +import java.util.Iterator; +import java.util.Map; + +import javax.portlet.MimeResponse; +import javax.portlet.PortletResponse; +import javax.portlet.PortletURL; +import javax.portlet.ResourceURL; +import javax.servlet.http.HttpServletRequest; + +import org.apache.wicket.Application; +import org.apache.wicket.IResourceListener; +import org.apache.wicket.RequestListenerInterface; +import org.apache.wicket.SystemMapper; +import org.apache.wicket.behavior.IBehaviorListener; +import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; +import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler; +import org.apache.wicket.core.request.handler.RenderPageRequestHandler; +import org.apache.wicket.core.request.mapper.AbstractComponentMapper; +import org.apache.wicket.portlet.request.mapper.PortletSystemMapper; +import org.apache.wicket.request.IRequestHandler; +import org.apache.wicket.request.Request; +import org.apache.wicket.request.Url; +import org.apache.wicket.request.cycle.RequestCycle; +import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; +import org.apache.wicket.request.resource.IResource; +import org.apache.wicket.request.resource.PackageResource; +import org.apache.wicket.request.resource.SharedResourceReference; +import org.apache.wicket.util.crypt.Base64; + +/** + * This class is the default request mapper for portlets. It modifies the + * generated URLs (that are generated by the wrapped SystemMapper) depending on + * the type of the used request handler. Its purpose is to implement all portlet + * related functionality from WebRequestCodingStrategy, that was used in Wicket + * 1.4. + * + * @author Peter Pastrnak + * @author Konstantinos Karavitis + */ +public class PortletRequestMapper extends AbstractComponentMapper { + + public static String PORTLET_URL = "portlet-url"; + + private SystemMapper systemMapper; + + public PortletRequestMapper(final Application application) { + systemMapper = new PortletSystemMapper(application); + } + + @Override + public IRequestHandler mapRequest(Request request) { + return systemMapper.mapRequest(request); + } + + @Override + public int getCompatibilityScore(Request request) { + return systemMapper.getCompatibilityScore(request); + } + + @Override + public Url mapHandler(IRequestHandler requestHandler) { + Url url = systemMapper.mapHandler(requestHandler); + if (ThreadPortletContext.getPortletRequest() == null || url == null) { + return url; + } + + if (requestHandler instanceof RenderPageRequestHandler) { + if (ThreadPortletContext.isAjax()) { + url = encodeRenderUrl(url, true); + } + } + else if (requestHandler instanceof SharedResourceReference) { + url = encodeSharedResourceUrl(url); + } + else if (requestHandler instanceof ResourceReferenceRequestHandler) { + ResourceReferenceRequestHandler resourceReferenceRequestHandler = (ResourceReferenceRequestHandler) requestHandler; + IResource resource = resourceReferenceRequestHandler.getResource(); + + if (resource instanceof PackageResource) { + url = encodeSharedResourceUrl(url); + } + else { + url = encodeResourceUrl(url); + } + } + else if (requestHandler instanceof BookmarkablePageRequestHandler) { + url = encodeRenderUrl(url, true); + } + //added mapping for request handlers with type of BookmarkableListenerInterfaceRequestHandler. The handling is the same as for handlers of type ListenerInterfaceRequestHandler + else if (requestHandler instanceof ListenerInterfaceRequestHandler || requestHandler instanceof BookmarkableListenerInterfaceRequestHandler) { + RequestListenerInterface listenerInterface; + + if (requestHandler instanceof ListenerInterfaceRequestHandler) { + listenerInterface = ((ListenerInterfaceRequestHandler) requestHandler).getListenerInterface(); + } + else { + listenerInterface = ((BookmarkableListenerInterfaceRequestHandler)requestHandler).getListenerInterface(); + } + + Class listenerClass = listenerInterface.getMethod().getDeclaringClass(); + if ((IResourceListener.class.isAssignableFrom(listenerClass)) || (IBehaviorListener.class.isAssignableFrom(listenerClass))) { + url = encodeResourceUrl(url); + } + else { + url = encodeActionUrl(url, ThreadPortletContext.isAjax()); + } + } + + return url; + } + + private String getQualifiedPath(String path) { + HttpServletRequest request = ThreadPortletContext.getHttpServletRequest(); + return request.getServletPath() + "/" + path; + } + + private Url parseUrl(String urlString) { + Url url = Url.parse(urlString); + + // to avoid UrlRenderer touching the url (shouldRenderAsFull) + url.setProtocol(null); + url.setHost(null); + url.setPort(null); + + return url; + } + + private Url encodeResourceUrl(Url url) { + if (url != null) { + String qualifiedPath = getQualifiedPath(url.toString()); + + PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); + if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { + try { + ResourceURL resourceUrl = ((MimeResponse) portletResponse).createResourceURL(); + resourceUrl.setResourceID(qualifiedPath); + qualifiedPath = resourceUrl.toString(); + + // resource URLs preserve all request render parameters (at + // least for Liferay even all POST parameters), so we have + // to remove all Wicket parameters (that have the portlet + // namespace), otherwise we would have all submited values + // in the URL + int queryStringSeparator = qualifiedPath.indexOf('?'); + if (queryStringSeparator > 0) { + Map parameterMap = Utils.parseQueryString(qualifiedPath.substring(queryStringSeparator + 1)); + + boolean changed = false; + Iterator> it = parameterMap.entrySet().iterator(); + String namespace = ThreadPortletContext.getNamespace(); + while (it.hasNext()) { + if (it.next().getKey().startsWith(namespace)) { + changed = true; + it.remove(); + } + } + if (changed) { + qualifiedPath = qualifiedPath.substring(0, queryStringSeparator) + '?' + Utils.buildQueryString(parameterMap); + } + } + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + url = parseUrl(qualifiedPath); + } + + return markAsPortletUrl(url); + } + + private Url encodeSharedResourceUrl(Url url) { + if (url != null) { + Request request = RequestCycle.get().getRequest(); + + StringBuilder urlBuilder = new StringBuilder(); + urlBuilder.append(request.getContextPath()); + urlBuilder.append(request.getFilterPath()); + urlBuilder.append(PortletFilter.SHARED_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX); + urlBuilder.append(Base64.encodeBase64URLSafeString(ThreadPortletContext.getWindowID().getBytes())); + urlBuilder.append('/'); + urlBuilder.append(url.toString()); + + url = Url.parse(urlBuilder.toString()); + } + + return url; + } + + private Url encodeActionUrl(Url url, boolean forceActionUrl) { + if ((!forceActionUrl) && (ThreadPortletContext.isResourceRequest())) { + return encodeResourceUrl(url); + } + + if (url != null) { + String qualifiedPath = getQualifiedPath(url.toString()); + + PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); + if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { + try { + PortletURL portletUrl = ((MimeResponse) portletResponse).createActionURL(); + portletUrl.setParameter(WicketPortlet.WICKET_URL_PORTLET_PARAMETER, qualifiedPath); + qualifiedPath = portletUrl.toString(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + url = parseUrl(qualifiedPath); + } + + return markAsPortletUrl(url); + } + + private Url encodeRenderUrl(Url url, boolean forceRenderUrl) { + if ((!forceRenderUrl) && (ThreadPortletContext.isResourceRequest())) { + return encodeResourceUrl(url); + } + + if (url != null) { + String qualifiedPath = getQualifiedPath(url.toString()); + + PortletResponse portletResponse = ThreadPortletContext.getPortletResponse(); + if ((portletResponse != null) && (portletResponse instanceof MimeResponse)) { + try { + PortletURL portletUrl = ((MimeResponse) portletResponse).createRenderURL(); + portletUrl.setParameter(WicketPortlet.WICKET_URL_PORTLET_PARAMETER + ThreadPortletContext.getPortletMode().toString(), qualifiedPath); + qualifiedPath = portletUrl.toString(); + } + catch (Exception e) { + throw new RuntimeException(e); + } + } + + url = parseUrl(qualifiedPath); + } + + return markAsPortletUrl(url); + } + + private Url markAsPortletUrl(Url url) { + url.setQueryParameter(PORTLET_URL, PORTLET_URL); + return url; + } +} diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java index a7af2fce13..afddd9acc3 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/PortletUrlRenderer.java @@ -83,6 +83,12 @@ public String renderContextRelativeUrl(String url) */ public String renderUrl(final Url url) { + + if (url.getQueryParameter(PortletRequestMapper.PORTLET_URL) != null) { + url.removeQueryParameters(PortletRequestMapper.PORTLET_URL); + return url.toString(); + } + CharSequence renderedUrl = super.renderUrl(url); Url absoluteUrl = Url.parse(renderedUrl); diff --git a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java index 01875678eb..c5de9151d5 100644 --- a/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java +++ b/portlet-parent/wicketstuff-portlet/src/main/java/org/apache/wicket/portlet/WicketPortlet.java @@ -415,7 +415,6 @@ private void processMimeResponseRequest(String wicketURL, final PortletRequest r String ajaxRedirectLocation = responseState.getAjaxRedirectLocation(); if (ajaxRedirectLocation != null) { // Ajax redirect - ajaxRedirectLocation = fixWicketUrl(wicketURL, ajaxRedirectLocation, request.getScheme()); responseState.clear(); responseState.setDateHeader("Date", System.currentTimeMillis()); responseState.setDateHeader("Expires", 0); From 235bfe909b336e0a349628803c5d95e13ab17be4 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 28 Oct 2016 10:38:29 +0200 Subject: [PATCH 041/139] [gmap3] Fix the name of an author Seems to break apps which do not use UTF-8 as markup encoding --- .../gmap3/src/main/java/org/wicketstuff/gmap/wicket-gmap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/wicket-gmap.js b/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/wicket-gmap.js index a0335147ec..9b5588d48c 100644 --- a/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/wicket-gmap.js +++ b/gmap3-parent/gmap3/src/main/java/org/wicketstuff/gmap/wicket-gmap.js @@ -17,7 +17,7 @@ /* * Wicket GMap3 * - * @author Tilman M�ller + * @author Tilman Mueller * @author Joachim F. Rohde */ // Wicket Namespace From 519130d04d222286754fd4bff7156cb32656580b Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 28 Oct 2016 11:45:09 +0200 Subject: [PATCH 042/139] Build against Wicket 7.6.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d51d289cec..2cd69fae13 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ - 7.5.0-SNAPSHOT + 7.6.0-SNAPSHOT 1.7 1.7 From 6c299dba6def5b9ac714d395c09bb30c65b41646 Mon Sep 17 00:00:00 2001 From: Miguel Payet Date: Mon, 31 Oct 2016 14:01:28 -0500 Subject: [PATCH 043/139] Fix the save action in an EditableGrid when there are more than 1 editable grids on the page (#558) * Fix edit and save actions for multiple editable grids in one page * Fix save action when there is more than one grid in the same page --- .../org/wicketstuff/egrid/component/EditableDataTable.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/editable-grid-parent/editable-grid/src/main/java/org/wicketstuff/egrid/component/EditableDataTable.java b/editable-grid-parent/editable-grid/src/main/java/org/wicketstuff/egrid/component/EditableDataTable.java index ef36c6256f..78236c689b 100644 --- a/editable-grid-parent/editable-grid/src/main/java/org/wicketstuff/egrid/component/EditableDataTable.java +++ b/editable-grid-parent/editable-grid/src/main/java/org/wicketstuff/egrid/component/EditableDataTable.java @@ -32,6 +32,7 @@ import org.wicketstuff.egrid.model.OperationType; import org.wicketstuff.egrid.provider.IEditableDataProvider; import org.wicketstuff.egrid.toolbar.AbstractEditableGridToolbar; +import org.wicketstuff.egrid.component.EditableDataTable; /** * @@ -517,8 +518,10 @@ public void onEvent(IEvent event) { @SuppressWarnings("unchecked") Item rowItem = ((Item)event.getPayload()); - this.datagrid.refreash(rowItem); - event.stop(); + if (rowItem.findParent(EditableDataTable.class).equals(this)) { + this.datagrid.refreash(rowItem); + event.stop(); + } } else if (event.getPayload() instanceof GridOperationData) { From 609c9a74af3a671110f5e15c72345e3761892e4c Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Tue, 1 Nov 2016 21:36:40 +0100 Subject: [PATCH 044/139] [clipboard.js] Initial commit of integration with Clipboard.js --- pom.xml | 12 +- wicketstuff-clipboard-js-parent/README.md | 3 + wicketstuff-clipboard-js-parent/pom.xml | 37 + .../wicketstuff-clipboardjs-examples/pom.xml | 57 ++ .../example/ClipboardJsApplication.java | 12 + .../example/ClipboardJsDemoPage.html | 14 + .../example/ClipboardJsDemoPage.java | 30 + .../src/main/resources/log4j.properties | 10 + .../src/main/webapp/WEB-INF/web.xml | 23 + .../clipboardjs/example/Start.java | 69 ++ .../wicketstuff-clipboardjs/pom.xml | 24 + .../clipboardjs/ClipboardJsBehavior.java | 68 ++ .../clipboardjs/ClipboardJsReference.java | 12 + .../wicketstuff/clipboardjs/res/clipboard.js | 753 ++++++++++++++++++ .../clipboardjs/res/clipboard.min.js | 7 + 15 files changed, 1125 insertions(+), 6 deletions(-) create mode 100644 wicketstuff-clipboard-js-parent/README.md create mode 100644 wicketstuff-clipboard-js-parent/pom.xml create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/pom.xml create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsApplication.java create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/resources/log4j.properties create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/webapp/WEB-INF/web.xml create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/test/java/org/wicketstuff/clipboardjs/example/Start.java create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/pom.xml create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsBehavior.java create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsReference.java create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.js create mode 100644 wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.min.js diff --git a/pom.xml b/pom.xml index 2cd69fae13..8c5cb38e6e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 @@ -330,6 +329,7 @@ wicket-facebook-parent wicket-html5-parent wicket-servlet3-parent + wicketstuff-clipboard-js-parent wicketstuff-springreference-parent wicket-security-parent @@ -1193,7 +1193,7 @@ - + @@ -1214,7 +1214,7 @@ - + @@ -1235,7 +1235,7 @@ - + @@ -1345,4 +1345,4 @@ - + \ No newline at end of file diff --git a/wicketstuff-clipboard-js-parent/README.md b/wicketstuff-clipboard-js-parent/README.md new file mode 100644 index 0000000000..5ab55d8eaa --- /dev/null +++ b/wicketstuff-clipboard-js-parent/README.md @@ -0,0 +1,3 @@ +An integration between Apache Wicket and Clipboard JS - copy text without Flash. + +For more information see https://clipboardjs.com/ diff --git a/wicketstuff-clipboard-js-parent/pom.xml b/wicketstuff-clipboard-js-parent/pom.xml new file mode 100644 index 0000000000..ec7bb615b3 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/pom.xml @@ -0,0 +1,37 @@ + + + + 4.0.0 + + + org.wicketstuff + wicketstuff-core + 7.0-SNAPSHOT + + wicketstuff-clipboardjs-parent + WicketStuff Clipboard JS Parent + + pom + + Parent project for WicketStuff Clipboard JS + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + wicketstuff-clipboardjs + wicketstuff-clipboardjs-examples + + + + + Martin Grigorov + + + + diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/pom.xml b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/pom.xml new file mode 100644 index 0000000000..1d08d4d76a --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/pom.xml @@ -0,0 +1,57 @@ + + 4.0.0 + + org.wicketstuff + wicketstuff-clipboardjs-parent + 7.0-SNAPSHOT + + + wicketstuff-clipboardjs-examples + war + WicketStuff Clipboard JS Example + Example usage of WicketStuff Clipboard JS + + + true + true + true + + + + + ${project.groupId} + wicketstuff-clipboardjs + ${project.parent.version} + + + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + + + junit + junit + + + + + org.eclipse.jetty.aggregate + jetty-all-server + + + + + + org.mortbay.jetty + jetty-maven-plugin + + + + diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsApplication.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsApplication.java new file mode 100644 index 0000000000..aa47a72242 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsApplication.java @@ -0,0 +1,12 @@ +package org.wicketstuff.clipboardjs.example; + +import org.apache.wicket.Page; +import org.apache.wicket.protocol.http.WebApplication; + +public class ClipboardJsApplication extends WebApplication { + @Override + public Class getHomePage() + { + return ClipboardJsDemoPage.class; + } +} diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html new file mode 100644 index 0000000000..c7d16ca4d8 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html @@ -0,0 +1,14 @@ + + + + + ClipboardJs demo page + + + + +
+ + + + diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java new file mode 100644 index 0000000000..c5b1b1b94c --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java @@ -0,0 +1,30 @@ +package org.wicketstuff.clipboardjs.example; + +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.markup.html.form.TextArea; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.wicketstuff.clipboardjs.ClipboardJsBehavior; + +/** + * Demo page that just adds the default BrowserIdPanel and a feedback panel to show any errors + */ +public class ClipboardJsDemoPage extends WebPage +{ + + private static final long serialVersionUID = 1L; + + public ClipboardJsDemoPage(final PageParameters parameters) + { + super(parameters); + + TextArea target = new TextArea("target"); + add(target); + + final WebMarkupContainer copyBtn = new WebMarkupContainer("copyBtn"); + final ClipboardJsBehavior clipboardJsBehavior = new ClipboardJsBehavior(); + clipboardJsBehavior.setTarget(target); + copyBtn.add(clipboardJsBehavior); + add(copyBtn); + } +} diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/resources/log4j.properties b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/resources/log4j.properties new file mode 100644 index 0000000000..235c6db299 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/resources/log4j.properties @@ -0,0 +1,10 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n + +log4j.rootLogger=INFO,Stdout + +log4j.logger.org.apache.wicket=INFO +log4j.logger.org.apache.wicket.protocol.http.HttpSessionStore=INFO +log4j.logger.org.apache.wicket.version=INFO +log4j.logger.org.apache.wicket.RequestCycle=INFO diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/webapp/WEB-INF/web.xml b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000000..804f3027c9 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,23 @@ + + + + ClipboardJs example + + + wicket.clipboardjs + org.apache.wicket.protocol.http.WicketFilter + + applicationClassName + org.wicketstuff.clipboardjs.example.ClipboardJsApplication + + + + + wicket.clipboardjs + /* + + + diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/test/java/org/wicketstuff/clipboardjs/example/Start.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/test/java/org/wicketstuff/clipboardjs/example/Start.java new file mode 100644 index 0000000000..fddcda7a68 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/test/java/org/wicketstuff/clipboardjs/example/Start.java @@ -0,0 +1,69 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.wicketstuff.clipboardjs.example; + +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.bio.SocketConnector; +import org.eclipse.jetty.webapp.WebAppContext; + +public class Start +{ + + public static void main(final String[] args) throws Exception + { + final Server server = new Server(); + final SocketConnector connector = new SocketConnector(); + + // Set some timeout options to make debugging easier. + connector.setMaxIdleTime(1000 * 60 * 60); + connector.setSoLingerTime(-1); + connector.setPort(8080); + server.setConnectors(new Connector[] { connector }); + + final WebAppContext bb = new WebAppContext(); + bb.setServer(server); + bb.setContextPath("/"); + bb.setWar("src/main/webapp"); + + // START JMX SERVER + // MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); + // MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer); + // server.getContainer().addEventListener(mBeanContainer); + // mBeanContainer.start(); + + server.setHandler(bb); + + try + { + System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP"); + server.start(); + System.in.read(); + System.out.println(">>> STOPPING EMBEDDED JETTY SERVER"); + // while (System.in.available() == 0) { + // Thread.sleep(5000); + // } + server.stop(); + server.join(); + } + catch (final Exception e) + { + e.printStackTrace(); + System.exit(100); + } + } +} diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/pom.xml b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/pom.xml new file mode 100644 index 0000000000..d0859ca981 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + org.wicketstuff + wicketstuff-clipboardjs-parent + 7.0-SNAPSHOT + + + wicketstuff-clipboardjs + WicketStuff Clipboard JS + An integration of Clipboard JS with Apache Wicket + + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsBehavior.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsBehavior.java new file mode 100644 index 0000000000..60c7c99e01 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsBehavior.java @@ -0,0 +1,68 @@ +package org.wicketstuff.clipboardjs; + +import org.apache.wicket.Component; +import org.apache.wicket.behavior.Behavior; +import org.apache.wicket.markup.ComponentTag; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; +import org.apache.wicket.util.lang.Args; +import org.apache.wicket.util.string.Strings; + +/** + * + */ +public class ClipboardJsBehavior extends Behavior { + + enum Action { + COPY, + CUT + } + + private Component button; + private String target; + private Action action = Action.COPY; + + public ClipboardJsBehavior setTarget(Component target) { + Args.notNull(target, "target"); + target.setOutputMarkupId(true); + this.target = target.getMarkupId(); + return this; + } + + public ClipboardJsBehavior setAction(Action action) { + this.action = action != null ? action : Action.COPY; + return this; + } + + @Override + public void bind(final Component component) { + super.bind(component); + + if (button != null) { + throw new IllegalStateException(ClipboardJsBehavior.class.getName() + " can be assigned to only one button"); + } + button = component.setOutputMarkupId(true); + } + + @Override + public void onComponentTag(final Component component, final ComponentTag tag) { + super.onComponentTag(component, tag); + + if (action == Action.CUT) { + tag.put("data-clipboard-action", "cut"); + } + + if (!Strings.isEmpty(target)) { + tag.put("data-clipboard-target", "#" + target); + } + } + + @Override + public void renderHead(final Component component, final IHeaderResponse response) { + super.renderHead(component, response); + + response.render(JavaScriptHeaderItem.forReference(ClipboardJsReference.INSTANCE)); + response.render(OnDomReadyHeaderItem.forScript(String.format("new Clipboard('#%s')", button.getMarkupId()))); + } +} diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsReference.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsReference.java new file mode 100644 index 0000000000..fb6632def3 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/ClipboardJsReference.java @@ -0,0 +1,12 @@ +package org.wicketstuff.clipboardjs; + +import org.apache.wicket.request.resource.JavaScriptResourceReference; + +public class ClipboardJsReference extends JavaScriptResourceReference { + + public static final ClipboardJsReference INSTANCE = new ClipboardJsReference(); + + private ClipboardJsReference() { + super(ClipboardJsReference.class, "res/clipboard.js"); + } +} diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.js b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.js new file mode 100644 index 0000000000..f9b772b503 --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.js @@ -0,0 +1,753 @@ +/*! + * clipboard.js v1.5.15 + * https://zenorocha.github.io/clipboard.js + * + * Licensed MIT © Zeno Rocha + */ +(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Clipboard = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o 0 && arguments[0] !== undefined ? arguments[0] : {}; + + this.action = options.action; + this.emitter = options.emitter; + this.target = options.target; + this.text = options.text; + this.trigger = options.trigger; + + this.selectedText = ''; + } + }, { + key: 'initSelection', + value: function initSelection() { + if (this.text) { + this.selectFake(); + } else if (this.target) { + this.selectTarget(); + } + } + }, { + key: 'selectFake', + value: function selectFake() { + var _this = this; + + var isRTL = document.documentElement.getAttribute('dir') == 'rtl'; + + this.removeFake(); + + this.fakeHandlerCallback = function () { + return _this.removeFake(); + }; + this.fakeHandler = document.body.addEventListener('click', this.fakeHandlerCallback) || true; + + this.fakeElem = document.createElement('textarea'); + // Prevent zooming on iOS + this.fakeElem.style.fontSize = '12pt'; + // Reset box model + this.fakeElem.style.border = '0'; + this.fakeElem.style.padding = '0'; + this.fakeElem.style.margin = '0'; + // Move element out of screen horizontally + this.fakeElem.style.position = 'absolute'; + this.fakeElem.style[isRTL ? 'right' : 'left'] = '-9999px'; + // Move element to the same position vertically + var yPosition = window.pageYOffset || document.documentElement.scrollTop; + this.fakeElem.addEventListener('focus', window.scrollTo(0, yPosition)); + this.fakeElem.style.top = yPosition + 'px'; + + this.fakeElem.setAttribute('readonly', ''); + this.fakeElem.value = this.text; + + document.body.appendChild(this.fakeElem); + + this.selectedText = (0, _select2.default)(this.fakeElem); + this.copyText(); + } + }, { + key: 'removeFake', + value: function removeFake() { + if (this.fakeHandler) { + document.body.removeEventListener('click', this.fakeHandlerCallback); + this.fakeHandler = null; + this.fakeHandlerCallback = null; + } + + if (this.fakeElem) { + document.body.removeChild(this.fakeElem); + this.fakeElem = null; + } + } + }, { + key: 'selectTarget', + value: function selectTarget() { + this.selectedText = (0, _select2.default)(this.target); + this.copyText(); + } + }, { + key: 'copyText', + value: function copyText() { + var succeeded = void 0; + + try { + succeeded = document.execCommand(this.action); + } catch (err) { + succeeded = false; + } + + this.handleResult(succeeded); + } + }, { + key: 'handleResult', + value: function handleResult(succeeded) { + this.emitter.emit(succeeded ? 'success' : 'error', { + action: this.action, + text: this.selectedText, + trigger: this.trigger, + clearSelection: this.clearSelection.bind(this) + }); + } + }, { + key: 'clearSelection', + value: function clearSelection() { + if (this.target) { + this.target.blur(); + } + + window.getSelection().removeAllRanges(); + } + }, { + key: 'destroy', + value: function destroy() { + this.removeFake(); + } + }, { + key: 'action', + set: function set() { + var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'copy'; + + this._action = action; + + if (this._action !== 'copy' && this._action !== 'cut') { + throw new Error('Invalid "action" value, use either "copy" or "cut"'); + } + }, + get: function get() { + return this._action; + } + }, { + key: 'target', + set: function set(target) { + if (target !== undefined) { + if (target && (typeof target === 'undefined' ? 'undefined' : _typeof(target)) === 'object' && target.nodeType === 1) { + if (this.action === 'copy' && target.hasAttribute('disabled')) { + throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute'); + } + + if (this.action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) { + throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes'); + } + + this._target = target; + } else { + throw new Error('Invalid "target" value, use a valid Element'); + } + } + }, + get: function get() { + return this._target; + } + }]); + + return ClipboardAction; + }(); + + module.exports = ClipboardAction; +}); + +},{"select":5}],8:[function(require,module,exports){ +(function (global, factory) { + if (typeof define === "function" && define.amd) { + define(['module', './clipboard-action', 'tiny-emitter', 'good-listener'], factory); + } else if (typeof exports !== "undefined") { + factory(module, require('./clipboard-action'), require('tiny-emitter'), require('good-listener')); + } else { + var mod = { + exports: {} + }; + factory(mod, global.clipboardAction, global.tinyEmitter, global.goodListener); + global.clipboard = mod.exports; + } +})(this, function (module, _clipboardAction, _tinyEmitter, _goodListener) { + 'use strict'; + + var _clipboardAction2 = _interopRequireDefault(_clipboardAction); + + var _tinyEmitter2 = _interopRequireDefault(_tinyEmitter); + + var _goodListener2 = _interopRequireDefault(_goodListener); + + function _interopRequireDefault(obj) { + return obj && obj.__esModule ? obj : { + default: obj + }; + } + + function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + } + + var _createClass = function () { + function defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + + return function (Constructor, protoProps, staticProps) { + if (protoProps) defineProperties(Constructor.prototype, protoProps); + if (staticProps) defineProperties(Constructor, staticProps); + return Constructor; + }; + }(); + + function _possibleConstructorReturn(self, call) { + if (!self) { + throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); + } + + return call && (typeof call === "object" || typeof call === "function") ? call : self; + } + + function _inherits(subClass, superClass) { + if (typeof superClass !== "function" && superClass !== null) { + throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); + } + + subClass.prototype = Object.create(superClass && superClass.prototype, { + constructor: { + value: subClass, + enumerable: false, + writable: true, + configurable: true + } + }); + if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; + } + + var Clipboard = function (_Emitter) { + _inherits(Clipboard, _Emitter); + + /** + * @param {String|HTMLElement|HTMLCollection|NodeList} trigger + * @param {Object} options + */ + function Clipboard(trigger, options) { + _classCallCheck(this, Clipboard); + + var _this = _possibleConstructorReturn(this, (Clipboard.__proto__ || Object.getPrototypeOf(Clipboard)).call(this)); + + _this.resolveOptions(options); + _this.listenClick(trigger); + return _this; + } + + /** + * Defines if attributes would be resolved using internal setter functions + * or custom functions that were passed in the constructor. + * @param {Object} options + */ + + + _createClass(Clipboard, [{ + key: 'resolveOptions', + value: function resolveOptions() { + var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + + this.action = typeof options.action === 'function' ? options.action : this.defaultAction; + this.target = typeof options.target === 'function' ? options.target : this.defaultTarget; + this.text = typeof options.text === 'function' ? options.text : this.defaultText; + } + }, { + key: 'listenClick', + value: function listenClick(trigger) { + var _this2 = this; + + this.listener = (0, _goodListener2.default)(trigger, 'click', function (e) { + return _this2.onClick(e); + }); + } + }, { + key: 'onClick', + value: function onClick(e) { + var trigger = e.delegateTarget || e.currentTarget; + + if (this.clipboardAction) { + this.clipboardAction = null; + } + + this.clipboardAction = new _clipboardAction2.default({ + action: this.action(trigger), + target: this.target(trigger), + text: this.text(trigger), + trigger: trigger, + emitter: this + }); + } + }, { + key: 'defaultAction', + value: function defaultAction(trigger) { + return getAttributeValue('action', trigger); + } + }, { + key: 'defaultTarget', + value: function defaultTarget(trigger) { + var selector = getAttributeValue('target', trigger); + + if (selector) { + return document.querySelector(selector); + } + } + }, { + key: 'defaultText', + value: function defaultText(trigger) { + return getAttributeValue('text', trigger); + } + }, { + key: 'destroy', + value: function destroy() { + this.listener.destroy(); + + if (this.clipboardAction) { + this.clipboardAction.destroy(); + this.clipboardAction = null; + } + } + }]); + + return Clipboard; + }(_tinyEmitter2.default); + + /** + * Helper function to retrieve attribute value. + * @param {String} suffix + * @param {Element} element + */ + function getAttributeValue(suffix, element) { + var attribute = 'data-clipboard-' + suffix; + + if (!element.hasAttribute(attribute)) { + return; + } + + return element.getAttribute(attribute); + } + + module.exports = Clipboard; +}); + +},{"./clipboard-action":7,"good-listener":4,"tiny-emitter":6}]},{},[8])(8) +}); \ No newline at end of file diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.min.js b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.min.js new file mode 100644 index 0000000000..607a71df6e --- /dev/null +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs/src/main/java/org/wicketstuff/clipboardjs/res/clipboard.min.js @@ -0,0 +1,7 @@ +/*! + * clipboard.js v1.5.15 + * https://zenorocha.github.io/clipboard.js + * + * Licensed MIT © Zeno Rocha + */ +!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var t;t="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,t.Clipboard=e()}}(function(){var e,t,n;return function e(t,n,i){function o(a,c){if(!n[a]){if(!t[a]){var l="function"==typeof require&&require;if(!c&&l)return l(a,!0);if(r)return r(a,!0);var s=new Error("Cannot find module '"+a+"'");throw s.code="MODULE_NOT_FOUND",s}var u=n[a]={exports:{}};t[a][0].call(u.exports,function(e){var n=t[a][1][e];return o(n?n:e)},u,u.exports,e,t,n,i)}return n[a].exports}for(var r="function"==typeof require&&require,a=0;a0&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function e(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function e(){var t=this,n="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=document.body.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[n?"right":"left"]="-9999px";var i=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.addEventListener("focus",window.scrollTo(0,i)),this.fakeElem.style.top=i+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,document.body.appendChild(this.fakeElem),this.selectedText=(0,o.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function e(){this.fakeHandler&&(document.body.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(document.body.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function e(){this.selectedText=(0,o.default)(this.target),this.copyText()}},{key:"copyText",value:function e(){var t=void 0;try{t=document.execCommand(this.action)}catch(e){t=!1}this.handleResult(t)}},{key:"handleResult",value:function e(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function e(){this.target&&this.target.blur(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function e(){this.removeFake()}},{key:"action",set:function e(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function e(){return this._action}},{key:"target",set:function e(t){if(void 0!==t){if(!t||"object"!==("undefined"==typeof t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function e(){return this._target}}]),e}();e.exports=c})},{select:5}],8:[function(t,n,i){!function(o,r){if("function"==typeof e&&e.amd)e(["module","./clipboard-action","tiny-emitter","good-listener"],r);else if("undefined"!=typeof i)r(n,t("./clipboard-action"),t("tiny-emitter"),t("good-listener"));else{var a={exports:{}};r(a,o.clipboardAction,o.tinyEmitter,o.goodListener),o.clipboard=a.exports}}(this,function(e,t,n,i){"use strict";function o(e){return e&&e.__esModule?e:{default:e}}function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function a(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function c(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function l(e,t){var n="data-clipboard-"+e;if(t.hasAttribute(n))return t.getAttribute(n)}var s=o(t),u=o(n),f=o(i),d=function(){function e(e,t){for(var n=0;n0&&void 0!==arguments[0]?arguments[0]:{};this.action="http://github.com/function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText}},{key:"listenClick",value:function e(t){var n=this;this.listener=(0,f.default)(t,"click",function(e){return n.onClick(e)})}},{key:"onClick",value:function e(t){var n=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new s.default({action:this.action(n),target:this.target(n),text:this.text(n),trigger:n,emitter:this})}},{key:"defaultAction",value:function e(t){return l("action",t)}},{key:"defaultTarget",value:function e(t){var n=l("target",t);if(n)return document.querySelector(n)}},{key:"defaultText",value:function e(t){return l("text",t)}},{key:"destroy",value:function e(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}]),t}(u.default);e.exports=h})},{"./clipboard-action":7,"good-listener":4,"tiny-emitter":6}]},{},[8])(8)}); \ No newline at end of file From 5e693bd2a808b71fa555fee24587a4f86bf7a58f Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Tue, 1 Nov 2016 22:05:37 +0100 Subject: [PATCH 045/139] [clipboard.js] Add support for setting the target by CSS selector. Add support for setting predefined text. Improve the demo page. --- wicketstuff-clipboard-js-parent/README.md | 60 +++++++++++++++++++ .../example/ClipboardJsDemoPage.html | 2 +- .../example/ClipboardJsDemoPage.java | 23 ++++--- .../clipboardjs/ClipboardJsBehavior.java | 51 ++++++++++++---- 4 files changed, 115 insertions(+), 21 deletions(-) diff --git a/wicketstuff-clipboard-js-parent/README.md b/wicketstuff-clipboard-js-parent/README.md index 5ab55d8eaa..6095fbb4c0 100644 --- a/wicketstuff-clipboard-js-parent/README.md +++ b/wicketstuff-clipboard-js-parent/README.md @@ -1,3 +1,63 @@ An integration between Apache Wicket and Clipboard JS - copy text without Flash. For more information see https://clipboardjs.com/ + +## Usage + +```java +package org.wicketstuff.clipboardjs.example; + +import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.markup.html.form.TextArea; +import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.wicketstuff.clipboardjs.ClipboardJsBehavior; + +public class ClipboardJsDemoPage extends WebPage { + private static final long serialVersionUID = 1L; + + public ClipboardJsDemoPage(final PageParameters parameters) { + super(parameters); + + TextArea target = new TextArea("target"); + add(target); + + final WebMarkupContainer copyBtn = new WebMarkupContainer("copyBtn"); + final ClipboardJsBehavior clipboardJsBehavior = new ClipboardJsBehavior(); + copyBtn.add(clipboardJsBehavior); + clipboardJsBehavior + // set Wicket Component (e.g. TextField or TextArea) as a target + .setTarget(target) + + // set the target by using CSS selector. This way there is no need to make the target a Wicket Component + // .setTarget(".target") + + // set the action to 'CUT'. Works only on non-disabled and +
+ + + + + +``` diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html index c7d16ca4d8..1b752bf085 100644 --- a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.html @@ -6,7 +6,7 @@ - +
diff --git a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java index c5b1b1b94c..b0969d613b 100644 --- a/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java +++ b/wicketstuff-clipboard-js-parent/wicketstuff-clipboardjs-examples/src/main/java/org/wicketstuff/clipboardjs/example/ClipboardJsDemoPage.java @@ -7,15 +7,12 @@ import org.wicketstuff.clipboardjs.ClipboardJsBehavior; /** - * Demo page that just adds the default BrowserIdPanel and a feedback panel to show any errors + * Demo page of {@link ClipboardJsBehavior} */ -public class ClipboardJsDemoPage extends WebPage -{ - +public class ClipboardJsDemoPage extends WebPage { private static final long serialVersionUID = 1L; - public ClipboardJsDemoPage(final PageParameters parameters) - { + public ClipboardJsDemoPage(final PageParameters parameters) { super(parameters); TextArea target = new TextArea("target"); @@ -23,8 +20,20 @@ public ClipboardJsDemoPage(final PageParameters parameters) final WebMarkupContainer copyBtn = new WebMarkupContainer("copyBtn"); final ClipboardJsBehavior clipboardJsBehavior = new ClipboardJsBehavior(); - clipboardJsBehavior.setTarget(target); copyBtn.add(clipboardJsBehavior); + clipboardJsBehavior + // set Wicket Component (e.g. TextField or TextArea) as a target + .setTarget(target) + + // set the target by using CSS selector. This way there is no need to make the target a Wicket Component + // .setTarget(".target") + + // set the action to 'CUT'. Works only on non-disabled and