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/09 10:59:23 UTC
[isis] branch master updated: ISIS-3040: split out former wicketstuff code into its own artifact (wicket/integration)
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 a79851b93e ISIS-3040: split out former wicketstuff code into its own artifact (wicket/integration)
a79851b93e is described below
commit a79851b93eac85af04c97ab0ce0713a2e90b44ab
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon May 9 12:59:19 2022 +0200
ISIS-3040: split out former wicketstuff code into its own artifact
(wicket/integration)
---
extensions/pom.xml | 5 ++
extensions/vw/pdfjs/wicket/integration/pom.xml | 63 +++++++++++++++
.../java/org/wicketstuff/pdfjs/PdfJsPanel.html | 0
.../java/org/wicketstuff/pdfjs/PdfJsPanel.java | 0
.../java/org/wicketstuff/pdfjs/PdfJsReference.java | 0
.../pdfjs/WicketStuffPdfJsReference.java | 0
.../src/main/java/org/wicketstuff/pdfjs/res/pdf.js | 0
.../java/org/wicketstuff/pdfjs/res/pdf.worker.js | 0
.../org/wicketstuff/pdfjs/res/wicketstuff-pdf.js | 0
extensions/vw/pdfjs/wicket/pom.xml | 4 +-
extensions/vw/pdfjs/wicket/ui/pom.xml | 91 +++++++++++-----------
11 files changed, 115 insertions(+), 48 deletions(-)
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 1b47f77606..a20fd6a0dc 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -150,6 +150,11 @@
<artifactId>isis-extensions-pdfjs-metamodel</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-wicket-integration</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
diff --git a/extensions/vw/pdfjs/wicket/integration/pom.xml b/extensions/vw/pdfjs/wicket/integration/pom.xml
new file mode 100644
index 0000000000..75eefb4ddd
--- /dev/null
+++ b/extensions/vw/pdfjs/wicket/integration/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-wicket</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-extensions-pdfjs-wicket-integration</artifactId>
+ <name>Apache Isis Ext - pdf.js - Wicket (Integration)</name>
+ <description>Integrates pdf.js with Wicket</description>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.pdfjs.wicket.integration</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/pdfjs/wicket/integration</git-plugin.propertiesDir>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- can be removed, once isis-viewer-wicket-ui does no longer need this
+ switch -->
+ <!-- overrides defaults as configured in our core pom, to make javadoc
+ failures non fatal and let the build continue; this we can set on a per module
+ basis, to apply only to those, we don't know how to fix otherwise -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket-ui</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.html b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.html
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.html
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.html
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.java
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsPanel.java
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsReference.java
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsReference.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/PdfJsReference.java
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/WicketStuffPdfJsReference.java b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/WicketStuffPdfJsReference.java
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/WicketStuffPdfJsReference.java
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/WicketStuffPdfJsReference.java
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/pdf.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/pdf.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/pdf.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/pdf.js
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/pdf.worker.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/pdf.worker.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/pdf.worker.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/pdf.worker.js
diff --git a/extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/wicketstuff-pdf.js b/extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/wicketstuff-pdf.js
similarity index 100%
rename from extensions/vw/pdfjs/wicket/ui/src/main/java/org/wicketstuff/pdfjs/res/wicketstuff-pdf.js
rename to extensions/vw/pdfjs/wicket/integration/src/main/java/org/wicketstuff/pdfjs/res/wicketstuff-pdf.js
diff --git a/extensions/vw/pdfjs/wicket/pom.xml b/extensions/vw/pdfjs/wicket/pom.xml
index e5812e2812..0a03e1ba91 100644
--- a/extensions/vw/pdfjs/wicket/pom.xml
+++ b/extensions/vw/pdfjs/wicket/pom.xml
@@ -27,12 +27,12 @@
</parent>
<artifactId>isis-extensions-pdfjs-wicket</artifactId>
- <name>Apache Isis Ext - pdf.js - Wicket</name>
+ <name>Apache Isis Ext - pdf.js Wicket</name>
<packaging>pom</packaging>
<modules>
-<!-- <module>integration</module> -->
+ <module>integration</module>
<module>ui</module>
</modules>
diff --git a/extensions/vw/pdfjs/wicket/ui/pom.xml b/extensions/vw/pdfjs/wicket/ui/pom.xml
index 93a253bdb6..d3dfd6065e 100644
--- a/extensions/vw/pdfjs/wicket/ui/pom.xml
+++ b/extensions/vw/pdfjs/wicket/ui/pom.xml
@@ -1,47 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- http://www.apache.org/licenses/LICENSE-2.0
+ <parent>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-wicket</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
+ <name>Apache Isis Ext - pdf.js - Wicket (UI)</name>
- <parent>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-pdfjs-wicket</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>isis-extensions-pdfjs-wicket-ui</artifactId>
- <name>Apache Isis Ext - pdf.js - Wicket Viewer (UI)</name>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.extensions.pdfjs.wicket.ui</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/extensions/pdfjs/wicket/ui</git-plugin.propertiesDir>
- </properties>
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.extensions.pdfjs.wicket.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/extensions/pdfjs/wicket/ui</git-plugin.propertiesDir>
+ </properties>
<build>
<plugins>
<plugin>
- <!-- can be removed, once isis-viewer-wicket-ui does no longer need this switch -->
- <!-- overrides defaults as configured in our core pom,
- to make javadoc failures non fatal and let the build continue;
- this we can set on a per module basis, to apply only to those,
- we don't know how to fix otherwise -->
+ <!-- can be removed, once isis-viewer-wicket-ui does no longer need this
+ switch -->
+ <!-- overrides defaults as configured in our core pom, to make javadoc
+ failures non fatal and let the build continue; this we can set on a per module
+ basis, to apply only to those, we don't know how to fix otherwise -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -51,17 +45,22 @@
</plugins>
</build>
- <dependencies>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-metamodel</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.isis.extensions</groupId>
- <artifactId>isis-extensions-pdfjs-metamodel</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.isis.extensions</groupId>
+ <artifactId>isis-extensions-pdfjs-wicket-integration</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.apache.isis.viewer</groupId>
+ <artifactId>isis-viewer-wicket-ui</artifactId>
+ </dependency>
+ </dependencies>
</project>