You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2025/01/14 15:20:06 UTC
(myfaces-tobago) branch tobago-5.x updated: refactor: hot deploy for charlotteville theme
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-5.x by this push:
new 677d0b7b95 refactor: hot deploy for charlotteville theme
677d0b7b95 is described below
commit 677d0b7b95f1d7139d53f3b326e8aa5e13c354c1
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Jan 14 15:57:38 2025 +0100
refactor: hot deploy for charlotteville theme
---
tobago-example/tobago-example-demo/pom.xml | 21 ++++++++++++++++++++-
tobago-theme/package.json | 4 +++-
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 7910cc8a2d..94e01267f6 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -34,6 +34,7 @@
<properties>
<exec.version>1.6.0</exec.version>
<tobago-theme-standard-dir>${basedir}/target/tobago-theme-standard</tobago-theme-standard-dir>
+ <tobago-theme-charlotteville-dir>${basedir}/target/tobago-theme-charlotteville</tobago-theme-charlotteville-dir>
<docker-tomcat-dir>${project.build.directory}/docker-tomcat</docker-tomcat-dir>
<frontend.skip>false</frontend.skip>
</properties>
@@ -110,6 +111,7 @@
<configuration>
<target>
<mkdir dir="${tobago-theme-standard-dir}/META-INF/resources" />
+ <mkdir dir="${tobago-theme-charlotteville-dir}/META-INF/resources" />
</target>
</configuration>
<goals>
@@ -223,6 +225,23 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-tobago-theme-charlotteville</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${tobago-theme-charlotteville-dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-theme-charlotteville</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -448,7 +467,7 @@
</webApp>
-->
<webApp>
- <resourceBases>${basedir}/src/main/webapp,${tobago-theme-standard-dir}/META-INF/resources
+ <resourceBases>${basedir}/src/main/webapp,${tobago-theme-standard-dir}/META-INF/resources,${tobago-theme-charlotteville-dir}/META-INF/resources
</resourceBases>
</webApp>
</configuration>
diff --git a/tobago-theme/package.json b/tobago-theme/package.json
index 6d116571aa..1cd62491db 100644
--- a/tobago-theme/package.json
+++ b/tobago-theme/package.json
@@ -62,7 +62,9 @@
"test": "jest",
"dev": "npm-run-all dev-css dev-ts",
"dev-css": "npm-run-all css dev-css-cp",
- "dev-css-cp": "ncp tobago-theme-standard/src/main/css ../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/${npm_package_version}/css",
+ "dev-css-cp": "npm-run-all --parallel dev-css-cp-*",
+ "dev-css-cp-standard": "ncp tobago-theme-standard/src/main/css ../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/${npm_package_version}/css",
+ "dev-css-cp-charlotteville": "ncp tobago-theme-charlotteville/src/main/css ../tobago-example/tobago-example-demo/target/tobago-theme-charlotteville/META-INF/resources/tobago/charlotteville/${npm_package_version}/css",
"dev-ts": "npm-run-all ts dev-ts-cp",
"dev-ts-cp": "ncp tobago-theme-standard/src/main/js ../tobago-example/tobago-example-demo/target/tobago-theme-standard/META-INF/resources/tobago/standard/${npm_package_version}/js"
},