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 2021/09/16 15:22:23 UTC
[isis] branch master updated: ISIS-2871: fixes pom hierarchy
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 76cf0ab ISIS-2871: fixes pom hierarchy
76cf0ab is described below
commit 76cf0abea34ba4933694117401b3b8ad046860d8
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 16 17:22:16 2021 +0200
ISIS-2871: fixes pom hierarchy
---
valuetypes/prism/pom.xml | 6 +++---
valuetypes/prism/{res => resources}/pom.xml | 0
.../src/main/java/org/apache/isis/valuetypes/prism/Prism.java | 0
.../src/main/resources/static/prism/css/prism1.20-default.css | 0
.../src/main/resources/static/prism}/css/prism1.24.1-coy.css | 0
.../src/main/resources/static/prism}/css/prism1.24.1-default.css | 0
.../src/main/resources/static/prism}/js/prism1.20.js | 0
.../src/main/resources/static/prism}/js/prism1.24.1.js | 0
valuetypes/prism/{vaa => vaadin}/pom.xml | 0
.../org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java | 0
valuetypes/prism/{wkt => wicket}/pom.xml | 0
.../org/apache/isis/valuetypes/prism/wkt/PrismResourcesWkt.java | 0
.../org/apache/isis/valuetypes/prism/wkt/css/prism1.20-default.css | 0
.../org/apache/isis/valuetypes/prism/wkt}/css/prism1.24.1-coy.css | 0
.../apache/isis/valuetypes/prism/wkt}/css/prism1.24.1-default.css | 0
.../main/java/org/apache/isis/valuetypes/prism/wkt}/js/prism1.20.js | 0
.../java/org/apache/isis/valuetypes/prism/wkt}/js/prism1.24.1.js | 0
17 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/valuetypes/prism/pom.xml b/valuetypes/prism/pom.xml
index e42862b..3ff9669 100644
--- a/valuetypes/prism/pom.xml
+++ b/valuetypes/prism/pom.xml
@@ -27,9 +27,9 @@
<packaging>pom</packaging>
<modules>
- <module>res</module>
- <module>wkt</module>
-<!-- <module>vaa</module> incubator -->
+ <module>resources</module>
+ <module>wicket</module>
+<!-- <module>vaadin</module> incubator -->
</modules>
</project>
diff --git a/valuetypes/prism/res/pom.xml b/valuetypes/prism/resources/pom.xml
similarity index 100%
rename from valuetypes/prism/res/pom.xml
rename to valuetypes/prism/resources/pom.xml
diff --git a/valuetypes/prism/res/src/main/java/org/apache/isis/valuetypes/prism/Prism.java b/valuetypes/prism/resources/src/main/java/org/apache/isis/valuetypes/prism/Prism.java
similarity index 100%
rename from valuetypes/prism/res/src/main/java/org/apache/isis/valuetypes/prism/Prism.java
rename to valuetypes/prism/resources/src/main/java/org/apache/isis/valuetypes/prism/Prism.java
diff --git a/valuetypes/prism/res/src/main/resources/static/prism/css/prism1.20-default.css b/valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.20-default.css
similarity index 100%
rename from valuetypes/prism/res/src/main/resources/static/prism/css/prism1.20-default.css
rename to valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.20-default.css
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-coy.css b/valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.24.1-coy.css
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-coy.css
rename to valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.24.1-coy.css
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-default.css b/valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.24.1-default.css
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-default.css
rename to valuetypes/prism/resources/src/main/resources/static/prism/css/prism1.24.1-default.css
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.20.js b/valuetypes/prism/resources/src/main/resources/static/prism/js/prism1.20.js
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.20.js
rename to valuetypes/prism/resources/src/main/resources/static/prism/js/prism1.20.js
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.24.1.js b/valuetypes/prism/resources/src/main/resources/static/prism/js/prism1.24.1.js
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.24.1.js
rename to valuetypes/prism/resources/src/main/resources/static/prism/js/prism1.24.1.js
diff --git a/valuetypes/prism/vaa/pom.xml b/valuetypes/prism/vaadin/pom.xml
similarity index 100%
rename from valuetypes/prism/vaa/pom.xml
rename to valuetypes/prism/vaadin/pom.xml
diff --git a/valuetypes/prism/vaa/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java b/valuetypes/prism/vaadin/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java
similarity index 100%
rename from valuetypes/prism/vaa/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java
rename to valuetypes/prism/vaadin/src/main/java/org/apache/isis/valuetypes/prism/vaa/PrismResourcesVaa.java
diff --git a/valuetypes/prism/wkt/pom.xml b/valuetypes/prism/wicket/pom.xml
similarity index 100%
rename from valuetypes/prism/wkt/pom.xml
rename to valuetypes/prism/wicket/pom.xml
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/PrismResourcesWkt.java b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/PrismResourcesWkt.java
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/PrismResourcesWkt.java
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/PrismResourcesWkt.java
diff --git a/valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.20-default.css b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.20-default.css
similarity index 100%
rename from valuetypes/prism/wkt/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.20-default.css
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.20-default.css
diff --git a/valuetypes/prism/res/src/main/resources/static/prism/css/prism1.24.1-coy.css b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-coy.css
similarity index 100%
rename from valuetypes/prism/res/src/main/resources/static/prism/css/prism1.24.1-coy.css
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-coy.css
diff --git a/valuetypes/prism/res/src/main/resources/static/prism/css/prism1.24.1-default.css b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-default.css
similarity index 100%
rename from valuetypes/prism/res/src/main/resources/static/prism/css/prism1.24.1-default.css
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/css/prism1.24.1-default.css
diff --git a/valuetypes/prism/res/src/main/resources/static/prism/js/prism1.20.js b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.20.js
similarity index 100%
rename from valuetypes/prism/res/src/main/resources/static/prism/js/prism1.20.js
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.20.js
diff --git a/valuetypes/prism/res/src/main/resources/static/prism/js/prism1.24.1.js b/valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.24.1.js
similarity index 100%
rename from valuetypes/prism/res/src/main/resources/static/prism/js/prism1.24.1.js
rename to valuetypes/prism/wicket/src/main/java/org/apache/isis/valuetypes/prism/wkt/js/prism1.24.1.js