You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/10 09:25:16 UTC
[isis] branch master updated: ISIS-3040: rename packages (alignment)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 72957549f8 ISIS-3040: rename packages (alignment)
72957549f8 is described below
commit 72957549f8e310cfe567dc68f392e657ca31c3b4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 10 11:25:09 2022 +0200
ISIS-3040: rename packages (alignment)
---
.../repainting/PdfJsViewerAdvisorFallback.java | 4 ++--
.../repainting/PropertyLayoutRepaintingVm.java | 2 +-
.../java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 2 +-
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 2 +-
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 2 +-
.../wicket => }/pdfjs/applib/annotations/PdfJsViewer.java | 4 ++--
.../wicket => }/pdfjs/applib/config/PdfJsConfig.java | 2 +-
.../{viewer/wicket => }/pdfjs/applib/config/Scale.java | 2 +-
.../wicket => }/pdfjs/applib/spi/PdfJsViewerAdvisor.java | 4 ++--
.../pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java | 4 ++--
.../pdfjs/metamodel/facet/PdfJsViewerFacet.java | 6 +++---
.../pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java | 6 +++---
.../metamodel/facet/PdfJsViewerFacetFromAnnotation.java | 10 +++++-----
.../facet/PdfJsViewerFacetFromAnnotationFactory.java | 4 ++--
.../wicket => }/pdfjs/wkt/integration/PdfJsConfigWkt.java | 6 +++---
.../wicket => }/pdfjs/wkt/integration/PdfJsPanel.html | 0
.../wicket => }/pdfjs/wkt/integration/PdfJsPanel.java | 6 +++---
.../wkt/integration/res/PdfJsIntegrationReference.java | 4 ++--
.../pdfjs/wkt/integration/res/PdfJsReference.java | 4 ++--
.../{viewer/wicket => }/pdfjs/wkt/integration/res/pdf.js | 0
.../wicket => }/pdfjs/wkt/integration/res/pdf.worker.js | 0
.../pdfjs/wkt/integration/res/pdfjs-integration.js | 0
extensions/vw/pdfjs/wicket/pom.xml | 7 -------
.../wicket => }/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java | 6 +++---
.../wkt/ui/components/PdfJsViewerCallbacksReference.java | 2 +-
.../pdfjs/wkt/ui/components/PdfJsViewerCssReference.java | 2 +-
.../pdfjs/wkt/ui/components/PdfJsViewerJsReference.java | 2 +-
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.css | 0
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.html | 0
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.java | 14 +++++++-------
.../pdfjs/wkt/ui/components/PdfJsViewerPanel.js | 0
.../ui/components/PdfJsViewerPanelCallbacks.template.js | 0
.../ui/components/PdfJsViewerPanelComponentFactory.java | 4 ++--
.../wkt/ui/components/ScalarModelSubscriberLegacy.java | 2 +-
.../pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java | 2 +-
35 files changed, 54 insertions(+), 61 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PdfJsViewerAdvisorFallback.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PdfJsViewerAdvisorFallback.java
index b78f960596..8049a1f786 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PdfJsViewerAdvisorFallback.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PdfJsViewerAdvisorFallback.java
@@ -20,8 +20,8 @@ package demoapp.dom.domain.properties.PropertyLayout.repainting;
import org.springframework.stereotype.Service;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi.PdfJsViewerAdvisor;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
@Service
public class PdfJsViewerAdvisorFallback implements PdfJsViewerAdvisor {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
index 9225394f2a..bdc1e67a96 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/repainting/PropertyLayoutRepaintingVm.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.annotations.PdfJsViewer;
+import org.apache.isis.extensions.pdfjs.applib.annotations.PdfJsViewer;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index 8a981a8eba..fee2d62fdb 100644
--- a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++ b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -28,7 +28,7 @@ import org.apache.isis.commons.internal.os._OsUtil;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
+import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jdo.dn5.IsisModuleValAsciidocPersistenceJdoDn5;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
diff --git a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 624d46885c..a38dc85220 100644
--- a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -27,7 +27,7 @@ import org.apache.isis.commons.internal.os._OsUtil;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
+import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jpa.IsisModuleValAsciidocPersistenceJpa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
diff --git a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index 390e412204..d9431d4cfb 100644
--- a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++ b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -27,7 +27,7 @@ import org.apache.isis.commons.internal.os._OsUtil;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
+import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsUi;
import org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import org.apache.isis.valuetypes.asciidoc.persistence.jpa.IsisModuleValAsciidocPersistenceJpa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/annotations/PdfJsViewer.java
similarity index 92%
rename from extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.java
rename to extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/annotations/PdfJsViewer.java
index 745f46b684..8106475483 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/annotations/PdfJsViewer.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/annotations/PdfJsViewer.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.applib.annotations;
+package org.apache.isis.extensions.pdfjs.applib.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
/**
* An annotation that can be applied on a <i>Property</i> or a <i>Parameter</i>
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/PdfJsConfig.java
similarity index 97%
rename from extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.java
rename to extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/PdfJsConfig.java
index 375ead641a..ba56a43fff 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/PdfJsConfig.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/PdfJsConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config;
+package org.apache.isis.extensions.pdfjs.applib.config;
import java.io.Serializable;
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/Scale.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/Scale.java
similarity index 96%
rename from extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/Scale.java
rename to extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/Scale.java
index 53061a7fd0..a1633dbcf9 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/config/Scale.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/config/Scale.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config;
+package org.apache.isis.extensions.pdfjs.applib.config;
import java.util.Objects;
diff --git a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/spi/PdfJsViewerAdvisor.java
similarity index 97%
rename from extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java
rename to extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/spi/PdfJsViewerAdvisor.java
index e4ca4d8e35..ed519ac828 100644
--- a/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/applib/spi/PdfJsViewerAdvisor.java
+++ b/extensions/vw/pdfjs/applib/src/main/java/org/apache/isis/extensions/pdfjs/applib/spi/PdfJsViewerAdvisor.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi;
+package org.apache.isis.extensions.pdfjs.applib.spi;
import java.io.Serializable;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
import lombok.RequiredArgsConstructor;
import lombok.Value;
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
similarity index 86%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
index 7cf228dd6e..c3d582a114 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/IsisModuleExtPdfjsMetaModel.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel;
+package org.apache.isis.extensions.pdfjs.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory;
+import org.apache.isis.extensions.pdfjs.metamodel.facet.PdfJsViewerFacetFromAnnotationFactory;
@Configuration
@Import({
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
similarity index 80%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
index 13c20c4bb3..4d9b5be4f9 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacet.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet;
+package org.apache.isis.extensions.pdfjs.metamodel.facet;
import org.apache.isis.core.metamodel.facetapi.Facet;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi.PdfJsViewerAdvisor;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
public interface PdfJsViewerFacet extends Facet {
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java
similarity index 86%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java
index a4a3f50adb..a6620dc49b 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetAbstract.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet;
+package org.apache.isis.extensions.pdfjs.metamodel.facet;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi.PdfJsViewerAdvisor;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
public abstract class PdfJsViewerFacetAbstract
extends FacetAbstract
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
similarity index 88%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
index eb771c46e9..406ec9f34d 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet;
+package org.apache.isis.extensions.pdfjs.metamodel.facet;
import java.util.List;
@@ -24,10 +24,10 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.annotations.PdfJsViewer;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi.PdfJsViewerAdvisor;
+import org.apache.isis.extensions.pdfjs.applib.annotations.PdfJsViewer;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
public class PdfJsViewerFacetFromAnnotation extends PdfJsViewerFacetAbstract {
diff --git a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
similarity index 94%
rename from extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
rename to extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
index 4a5db56e1c..f6f204cb8f 100644
--- a/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
+++ b/extensions/vw/pdfjs/metamodel/src/main/java/org/apache/isis/extensions/pdfjs/metamodel/facet/PdfJsViewerFacetFromAnnotationFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet;
+package org.apache.isis.extensions.pdfjs.metamodel.facet;
import javax.inject.Inject;
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.annotations.PdfJsViewer;
+import org.apache.isis.extensions.pdfjs.applib.annotations.PdfJsViewer;
import lombok.val;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsConfigWkt.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java
similarity index 94%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsConfigWkt.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java
index c50af9edf9..0576986ddd 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsConfigWkt.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsConfigWkt.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration;
+package org.apache.isis.extensions.pdfjs.wkt.integration;
import org.apache.wicket.util.lang.Args;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
import de.agilecoders.wicket.jquery.AbstractConfig;
import de.agilecoders.wicket.jquery.IKey;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsPanel.html b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.html
similarity index 100%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsPanel.html
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.html
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsPanel.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
similarity index 89%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsPanel.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
index 93168c1e7a..904eef8eb4 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/PdfJsPanel.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/PdfJsPanel.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration;
+package org.apache.isis.extensions.pdfjs.wkt.integration;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.res.PdfJsIntegrationReference;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.res.PdfJsReference;
+import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsIntegrationReference;
+import org.apache.isis.extensions.pdfjs.wkt.integration.res.PdfJsReference;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import lombok.Getter;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
similarity index 92%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
index 3ed6fa164f..aeefab4b34 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.res;
+package org.apache.isis.extensions.pdfjs.wkt.integration.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.PdfJsConfigWkt;
+import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
import lombok.Getter;
import lombok.experimental.Accessors;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
similarity index 93%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsReference.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
index 2a4d6cbee2..5e6cc3e871 100644
--- a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsReference.java
+++ b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/PdfJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.res;
+package org.apache.isis.extensions.pdfjs.wkt.integration.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -24,7 +24,7 @@ import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.PdfJsConfigWkt;
+import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
import lombok.Getter;
import lombok.experimental.Accessors;
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdf.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdf.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdf.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdf.js
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdf.worker.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdf.worker.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdf.worker.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdf.worker.js
diff --git a/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdfjs-integration.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdfjs-integration.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdfjs-integration.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/pdfjs/wkt/integration/res/pdfjs-integration.js
diff --git a/extensions/vw/pdfjs/wicket/pom.xml b/extensions/vw/pdfjs/wicket/pom.xml
index 5b234e48d5..0a03e1ba91 100644
--- a/extensions/vw/pdfjs/wicket/pom.xml
+++ b/extensions/vw/pdfjs/wicket/pom.xml
@@ -35,12 +35,5 @@
<module>integration</module>
<module>ui</module>
</modules>
-
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- <!-- to avoid polluting the classpath -->
- <optional>true</optional>
- </dependency>
</project>
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java
similarity index 81%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java
index 5f3aecb02d..6222766d76 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/IsisModuleExtPdfjsUi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui;
+package org.apache.isis.extensions.pdfjs.wkt.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.IsisModuleExtPdfjsMetaModel;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components.PdfJsViewerPanelComponentFactory;
+import org.apache.isis.extensions.pdfjs.metamodel.IsisModuleExtPdfjsMetaModel;
+import org.apache.isis.extensions.pdfjs.wkt.ui.components.PdfJsViewerPanelComponentFactory;
/**
* @since 2.0 {@index}
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java
similarity index 95%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java
index dbf191b4d4..e89bb2a315 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import org.apache.isis.viewer.wicket.ui.util.LicensedTextTemplate;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java
similarity index 95%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java
index bf553eefee..7e44d1e3af 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java
similarity index 95%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java
index d18ecf3df9..777518d64b 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.css b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.css
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.css
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.css
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.html b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.html
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.html
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.html
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
similarity index 95%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
index fc3835f7a1..594a355de8 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import java.util.Map;
@@ -44,12 +44,12 @@ import org.apache.wicket.request.resource.IResource;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.PdfJsConfig;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.config.Scale;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.applib.spi.PdfJsViewerAdvisor;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewerFacet;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.PdfJsConfigWkt;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.integration.PdfJsPanel;
+import org.apache.isis.extensions.pdfjs.applib.config.PdfJsConfig;
+import org.apache.isis.extensions.pdfjs.applib.config.Scale;
+import org.apache.isis.extensions.pdfjs.applib.spi.PdfJsViewerAdvisor;
+import org.apache.isis.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet;
+import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsConfigWkt;
+import org.apache.isis.extensions.pdfjs.wkt.integration.PdfJsPanel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import lombok.val;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.js b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanel.js
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanel.js
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanelCallbacks.template.js b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelCallbacks.template.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanelCallbacks.template.js
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelCallbacks.template.js
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
similarity index 94%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
index f1292ed710..58b360562b 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/PdfJsViewerPanelComponentFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import java.util.Objects;
@@ -28,7 +28,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.extensions.viewer.wicket.pdfjs.metamodel.facet.PdfJsViewerFacet;
+import org.apache.isis.extensions.pdfjs.metamodel.facet.PdfJsViewerFacet;
import org.apache.isis.viewer.common.model.components.ComponentType;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java
similarity index 93%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java
index 664f924f89..123ee953aa 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarModelSubscriberLegacy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import org.apache.wicket.ajax.AjaxRequestTarget;
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
similarity index 99%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
rename to extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
index 024287e989..5645187282 100644
--- a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
+++ b/extensions/vw/pdfjs/wicket/ui/src/main/java/org/apache/isis/extensions/pdfjs/wkt/ui/components/ScalarPanelAbstractLegacy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.viewer.wicket.pdfjs.wkt.ui.components;
+package org.apache.isis.extensions.pdfjs.wkt.ui.components;
import java.util.List;