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 2020/04/17 05:22:53 UTC
[isis] branch master updated (deec93f -> 0e6ffbc)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from deec93f ISIS-2340: AsciiDoc type support for vaadin
new dfd91b5 ISIS-2340: prepare switch to official prism package (webjars)
new 0d87e84 ISIS-2340: bump vaadin 14.1.23 -> 14.1.25
new 0e6ffbc ISIS-2340: fixes commons-fileupload convergence issue (wicket/vaadin)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
core/pom.xml | 2 +-
incubator/viewers/vaadin/ui/pom.xml | 12 ++++++++++++
valuetypes/asciidoc/ui/pom.xml | 12 ++++++------
.../asciidoc/ui/components/prism/PrismResources.java | 9 ++++++---
.../asciidoc/ui/components/wkt/AsciiDocComponentWkt.java | 4 ++--
.../components/scalars/markup/MarkupComponent_reloadJs.java | 6 +++---
6 files changed, 30 insertions(+), 15 deletions(-)
[isis] 02/03: ISIS-2340: bump vaadin 14.1.23 -> 14.1.25
Posted by ah...@apache.org.
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
commit 0d87e8434b519895acff5d6884ab938df27741d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 17 07:15:17 2020 +0200
ISIS-2340: bump vaadin 14.1.23 -> 14.1.25
Task-Url: https://issues.apache.org/jira/browse/ISIS-2340
---
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index dda1dec..849cc2a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -173,7 +173,7 @@
<togglz.version>2.1.0.Final</togglz.version>
- <vaadin.version>14.1.23</vaadin.version>
+ <vaadin.version>14.1.25</vaadin.version>
<wicket.version>8.7.0</wicket.version>
<wicket-bootstrap.version>2.0.13</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap-core -->
[isis] 01/03: ISIS-2340: prepare switch to official prism package
(webjars)
Posted by ah...@apache.org.
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
commit dfd91b5b6efbae0accce80e77f8fb0a1a0449e51
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 17 07:07:37 2020 +0200
ISIS-2340: prepare switch to official prism package (webjars)
---
valuetypes/asciidoc/ui/pom.xml | 12 ++++++------
.../asciidoc/ui/components/prism/PrismResources.java | 9 ++++++---
.../asciidoc/ui/components/wkt/AsciiDocComponentWkt.java | 4 ++--
.../components/scalars/markup/MarkupComponent_reloadJs.java | 6 +++---
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 27a090a..217cce0 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -125,12 +125,12 @@
</dependency>
<!-- END OF ASCII-DOC -->
-<!-- TODO instead of providing prism resources with our class path, we should switch to the webjars version -->
-<!-- <dependency> -->
-<!-- <groupId>org.webjars.bower</groupId> -->
-<!-- <artifactId>prism</artifactId> -->
-<!-- <version>1.16.0</version> -->
-<!-- </dependency> -->
+ <!-- PRISM (SYNTAX HIGHLIGHTING) -->
+ <dependency>
+ <groupId>org.webjars.bower</groupId>
+ <artifactId>prism</artifactId>
+ <version>1.16.0</version>
+ </dependency>
</dependencies>
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/prism/PrismResources.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/prism/PrismResources.java
index ab86df6..e00b65a 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/prism/PrismResources.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/prism/PrismResources.java
@@ -20,6 +20,7 @@ package org.apache.isis.valuetypes.asciidoc.ui.components.prism;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.isis.incubator.viewer.vaadin.ui.util.LocalResourceUtil;
@@ -30,7 +31,7 @@ import lombok.experimental.UtilityClass;
public final class PrismResources {
@Getter(lazy = true) private static final LocalResourceUtil.ResourceDescriptor cssResourceReferenceVaa =
- //LocalResourceUtil.ResourceDescriptor.webjars("prism/1.16.0/themes/prism-okaida.css");
+ //LocalResourceUtil.ResourceDescriptor.webjars("prism/1.16.0/themes/prism.css");
LocalResourceUtil.ResourceDescriptor.staticRoot("prism/css/prism.css");
@@ -38,10 +39,12 @@ public final class PrismResources {
//LocalResourceUtil.ResourceDescriptor.webjars("prism/1.16.0/prism.js");
LocalResourceUtil.ResourceDescriptor.staticRoot("prism/js/prism1.14.js");
- @Getter(lazy = true) private static final CssResourceReference cssResourceReferenceWkt =
+ @Getter(lazy = true) private static final ResourceReference cssResourceReferenceWkt =
+ //new ContextRelativeResourceReference("webjars/prism/1.16.0/themes/prism.css", false);
new CssResourceReference(PrismResources.class, "css/prism.css");
- @Getter(lazy = true) private static final JavaScriptResourceReference jsResourceReferenceWkt =
+ @Getter(lazy = true) private static final ResourceReference jsResourceReferenceWkt =
+ //new ContextRelativeResourceReference("webjars/prism/1.16.0/prism.js", false);
new JavaScriptResourceReference(PrismResources.class, "js/prism1.14.js");
}
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/wkt/AsciiDocComponentWkt.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/wkt/AsciiDocComponentWkt.java
index 7a20879..c81ecc6 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/wkt/AsciiDocComponentWkt.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/wkt/AsciiDocComponentWkt.java
@@ -24,7 +24,7 @@ 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.model.IModel;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.isis.valuetypes.asciidoc.ui.components.prism.PrismResources;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
@@ -55,7 +55,7 @@ public class AsciiDocComponentWkt extends MarkupComponent {
response.render(JavaScriptHeaderItem.forReference(jsRef()));
}
- private static final JavaScriptResourceReference jsRef() {
+ private static final ResourceReference jsRef() {
return PrismResources.getJsResourceReferenceWkt();
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
index 61a6643..a0c3576 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent_reloadJs.java
@@ -23,7 +23,7 @@ import java.util.UUID;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
import lombok.val;
@@ -33,7 +33,7 @@ import lombok.val;
*/
public class MarkupComponent_reloadJs {
- public static CharSequence decorate(CharSequence htmlContent, JavaScriptResourceReference jsRef) {
+ public static CharSequence decorate(CharSequence htmlContent, ResourceReference jsRef) {
val targetId = UUID.randomUUID().toString();
@@ -48,7 +48,7 @@ public class MarkupComponent_reloadJs {
return sb.toString();
}
- private static String getUrl(JavaScriptResourceReference jsRef) {
+ private static String getUrl(ResourceReference jsRef) {
IRequestHandler handler = new ResourceReferenceRequestHandler(jsRef, null);
return RequestCycle.get().urlFor(handler).toString();
}
[isis] 03/03: ISIS-2340: fixes commons-fileupload convergence issue
(wicket/vaadin)
Posted by ah...@apache.org.
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
commit 0e6ffbc13309d8b22cbd54125a1ad54df5ce95db
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 17 07:22:37 2020 +0200
ISIS-2340: fixes commons-fileupload convergence issue (wicket/vaadin)
---
incubator/viewers/vaadin/ui/pom.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/incubator/viewers/vaadin/ui/pom.xml b/incubator/viewers/vaadin/ui/pom.xml
index 2d5dd46..e0d4fc0 100644
--- a/incubator/viewers/vaadin/ui/pom.xml
+++ b/incubator/viewers/vaadin/ui/pom.xml
@@ -92,6 +92,18 @@
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- convergence issue with wicket 1.3.3 vs 1.4 -->
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.4</version>
</dependency>
</dependencies>