You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by jo...@apache.org on 2021/12/27 16:01:40 UTC
[isis] branch ISIS-2878 updated: ISIS-2878 kroviz jar with path /public, kroviz/index.html now yields a valid reponse
This is an automated email from the ASF dual-hosted git repository.
joergrade pushed a commit to branch ISIS-2878
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-2878 by this push:
new c9ff9ae ISIS-2878 kroviz jar with path /public, kroviz/index.html now yields a valid reponse
c9ff9ae is described below
commit c9ff9ae628d5d6e38afd3cd6f5b4d96bac73d5ee
Author: Jörg Rade <jo...@kuehne-nagel.com>
AuthorDate: Mon Dec 27 17:01:18 2021 +0100
ISIS-2878 kroviz jar with path /public, kroviz/index.html now yields a valid reponse
---
examples/demo/domain/pom.xml | 82 ++++++++++++++++++++++---------
incubator/clients/kroviz/build.gradle.kts | 4 +-
2 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/examples/demo/domain/pom.xml b/examples/demo/domain/pom.xml
index da0b3da..caa6f94 100644
--- a/examples/demo/domain/pom.xml
+++ b/examples/demo/domain/pom.xml
@@ -27,29 +27,63 @@
<properties>
</properties>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>application.yml</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <!-- we include all .java too, so that we can reference it from the descriptions -->
- <include>**</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>unpack-jar-features</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Copy jar to source project</echo>
+ <copy todir="${project.build.directory}/classes">
+ <fileset dir="${project.basedir}/../../../incubator/clients/kroviz/build/libs/">
+ <include name="*.jar"/>
+ <exclude name="*sources.jar"/>
+ </fileset>
+ </copy>
+ <echo>Unpack jar</echo>echo>
+ <unzip dest="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="*.jar"/>
+ </fileset>
+ </unzip>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>application.yml</include>
+ </includes>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/java</directory>
+ <includes>
+ <!-- we include all .java too, so that we can reference it from the descriptions -->
+ <include>**</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
<dependencies>
@@ -106,7 +140,7 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-markdown-applib</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.extensions</groupId>
<artifactId>isis-extensions-fullcalendar-applib</artifactId>
diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts
index bf46286..cb1fb96 100644
--- a/incubator/clients/kroviz/build.gradle.kts
+++ b/incubator/clients/kroviz/build.gradle.kts
@@ -128,9 +128,9 @@ afterEvaluate {
).destinationDirectory
from(distribution) {
include("**/*.*")
- into("/static/kroviz/")
+ into("/public/kroviz/")
}
- from(webDir) { into("/static/kroviz/") }
+ from(webDir) { into("/public/kroviz/") }
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
inputs.files(distribution, webDir)
outputs.file(archiveFile)