You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/05 00:41:11 UTC
[isis] 02/02: ISIS-2213: moves classes around in
viewer-wicket-viewer
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b4287fb1ea8b219d3e7ab3d74b28f920b6e774f8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 5 00:36:15 2019 +0000
ISIS-2213: moves classes around in viewer-wicket-viewer
---
.../viewer/{settings => integration}/IsisResourceSettings.java | 2 +-
.../{imagecache => services}/ImageResourceCacheClassPath.java | 2 +-
.../isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java | 9 ++++-----
.../viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 3 +--
.../TargetRespondListenerToResetQueryResultCache.java | 2 +-
.../{imagecache => services}/ImageResourceCacheKeyTest.java | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
similarity index 98%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
rename to core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
index 9896775..36145d3 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/IsisResourceSettings.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/IsisResourceSettings.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.settings;
+package org.apache.isis.viewer.wicket.viewer.integration;
import java.util.List;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
similarity index 99%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
rename to core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
index 2f0b8df..a0042a8 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheClassPath.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.imagecache;
+package org.apache.isis.viewer.wicket.viewer.services;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 8dc4fa8..a2dd919 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -26,6 +26,7 @@ import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import org.apache.isis.config.IsisConfiguration;
+import org.apache.wicket.protocol.http.WicketFilter;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
@@ -47,9 +48,7 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpected
@Service @Order(-80)
public final class WebModuleWicket implements WebModule {
- private final static String WICKET_FILTER_CLASS_NAME =
- "org.apache.wicket.protocol.http.WicketFilter";
-
+ private final static String WICKET_FILTER_CLASS_NAME = WicketFilter.class.getName();
private final static String WICKET_FILTER_NAME = "WicketFilter";
private final IsisSystemEnvironment isisSystemEnvironment;
@@ -64,9 +63,9 @@ public final class WebModuleWicket implements WebModule {
this.isisSystemEnvironment = isisSystemEnvironment;
this.isisConfiguration = isisConfiguration;
- wicketBasePath = isisConfiguration.getViewer().getWicket().getBasePath();
+ wicketBasePath = this.isisConfiguration.getViewer().getWicket().getBasePath();
- deploymentMode = isisSystemEnvironment.isPrototyping()
+ deploymentMode = this.isisSystemEnvironment.isPrototyping()
? "development"
: "deployment";
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 8b7f4ec..6d0d955 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -27,7 +27,6 @@ import java.util.function.Function;
import javax.inject.Inject;
-import org.apache.isis.viewer.wicket.viewer.TargetRespondListenerToResetQueryResultCache;
import org.apache.wicket.Application;
import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
@@ -91,7 +90,7 @@ import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionF
import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapter;
import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.WebRequestCycleForIsis;
-import org.apache.isis.viewer.wicket.viewer.settings.IsisResourceSettings;
+import org.apache.isis.viewer.wicket.viewer.integration.IsisResourceSettings;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import static java.util.Objects.requireNonNull;
diff --git a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
similarity index 96%
rename from core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
rename to core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
index 5cede7d..080fe79 100644
--- a/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/TargetRespondListenerToResetQueryResultCache.java
+++ b/core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/TargetRespondListenerToResetQueryResultCache.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer;
+package org.apache.isis.viewer.wicket.viewer.wicketapp;
import javax.inject.Inject;
diff --git a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
similarity index 99%
rename from core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
rename to core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
index a40f05c..6b65f31 100644
--- a/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/imagecache/ImageResourceCacheKeyTest.java
+++ b/core/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheKeyTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.viewer.imagecache;
+package org.apache.isis.viewer.wicket.viewer.services;
import java.util.Iterator;
import java.util.List;