This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit 62da2e2eff79d7c741b6a806ad162fedbddbfc82 Author: Georg Kallidis <[email protected]> AuthorDate: Fri Oct 31 14:28:04 2025 +0100 Update after test new logo, prepare release --- pom.xml | 1 - .../resources/archetype-resources/docs/README.md | 37 +++++++++++---------- src/main/resources/archetype-resources/pom.xml | 24 ++++++------- .../src/main/docker-resources/app/Dockerfile | 2 +- .../default/images/ASF_Badge_apacheway-purple.png | Bin 0 -> 89185 bytes .../ui/skins/default/images/turbine-project.png | Bin 21047 -> 0 bytes .../ui/skins/default/images/turbine4-project.png | Bin 14902 -> 0 bytes .../main/webapp/templates/app/layouts/Default.vm | 3 +- 8 files changed, 35 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index a2aefc1..4fa0472 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ <version>14</version> <relativePath /> </parent> - <groupId>org.apache.turbine</groupId> <artifactId>turbine-webapp-7.0-SNAPSHOT</artifactId> <version>4.0.0</version> <packaging>maven-archetype</packaging> diff --git a/src/main/resources/archetype-resources/docs/README.md b/src/main/resources/archetype-resources/docs/README.md index 7b34b78..7503b15 100644 --- a/src/main/resources/archetype-resources/docs/README.md +++ b/src/main/resources/archetype-resources/docs/README.md @@ -8,11 +8,11 @@ These instructions will get you a copy of the project up and running on your loc ### Prerequisites -* Java 17 JDK or later (Turbine 6.0 and later), before Java 8 +* Java 17 JDK or later (Turbine 7.0 and later) * [MySQL](https://www.mysql.com/) - Database Server or [Docker] (https://docs.docker.com/get-docker/) * [Maven](https://maven.apache.org/) - Dependency Management -You should have Java 11 or later installed. The archetype sets up a new application using MySQL as the default database store. However, you can adjust this to use any database supported by Apache Torque 5.x. If not using Docker, you should therefore be at least have a database instance where you have access rights to create a new database schema and populate it with the tables the application generates. Finally, this is a maven archetype, so of course you should install a local versio [...] +You should have Java 17 or later installed. The archetype sets up a new application using MySQL as the default database store. However, you can adjust this to use any database supported by Apache Torque 7.x. If not using Docker, you should therefore be at least have a database instance where you have access rights to create a new database schema and populate it with the tables the application generates. Finally, this is a maven archetype, so of course you should install a local version [...] ## About this archetype @@ -104,7 +104,6 @@ This requires you provide a local catalog in $HOME\.m2\archetype-catalog.xml, e. </archetype-catalog> - Find further information here: https://maven.apache.org/archetype/archetype-models/archetype-catalog/archetype-catalog.html. ##### Example @@ -121,44 +120,48 @@ This requires you provide a local catalog in $HOME\.m2\archetype-catalog.xml, e. </archetype-catalog> ``` +- Find the recent archetype, e.g. org.apache.turbine:turbine-webapp-7.0-SNAPSHOT and select a number, and configure (docker should be set to false, if you do not need it). + + + ## Project Start and Usage Next, change into the newly generated project folder, in our case -```sh -cd myhelloworld -``` + cd myhelloworld + Skip next two steps, if the build was successfull. -```sh -mvn generate-sources -``` + mvn generate-sources + This will generate the OM layer and SQL code for creating the corresponding database tables. + mvn integration-test -```sh -mvn integration-test -``` This executes the SQL code to create the application schema defined in src/main/torque-schema. You should now check the database tables and if some data is missing insert the sample data file in sample-mysql-data (since Torque 4.0 the datasql task is disabled). -```sh -mvn clean install -``` + mvn clean install + If you get an error like *"The driver has not received any packets"* probably the database is not up and running or the port may be another one. Last step on the command line is run the server by invoking -mvn jetty:run + + mvn jetty:run - Now you can launch your new Turbine application by default [http://localhost:8081/app] (check port in pom.xml, if needed). ### Logs -Find the Logs in src/main/webapp/logs and +Find the Logs in + + src/main/webapp/logs + +and ### Application diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 1ab23f5..b3bd54a 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -115,7 +115,7 @@ under the License. <target>#var("maven.compile.target")</target> <encoding>#var("project.build.sourceEncoding")</encoding> <!-- if this is not specified throws an error in Eclipse IDE --> - <executable>#var("java.home")/bin/javac</executable> + <executable>#var("java.home")/bin/javac</executable> </configuration> </plugin> <plugin> @@ -278,17 +278,17 @@ under the License. <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-maven-plugin</artifactId> <version>12.0.22</version> - <configuration> - <!-- https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations --> - <scanIntervalSeconds>10</scanIntervalSeconds> - <httpConnector> - <port>8081</port> - <idleTimeout>60000</idleTimeout> - </httpConnector> - <webApp> - <jettyEnvXml>${project.build.directory}/${project.build.finalName}/WEB-INF/jetty-ee10-env.xml</jettyEnvXml> - </webApp> - </configuration> + <configuration> + <!-- https://www.eclipse.org/jetty/documentation/jetty-9/index.html#jars-scanned-for-annotations --> + <scanIntervalSeconds>10</scanIntervalSeconds> + <httpConnector> + <port>8081</port> + <idleTimeout>60000</idleTimeout> + </httpConnector> + <webApp> + <jettyEnvXml>${project.build.directory}/${project.build.finalName}/WEB-INF/jetty-ee10-env.xml</jettyEnvXml> + </webApp> + </configuration> </plugin> </plugins> </build> diff --git a/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile b/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile index a0937c9..f202fe7 100644 --- a/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile +++ b/src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:latest +FROM maven:3-jdk-11 # cft hub.docker.com/r/library/maven # not used, as in docker-compose m2repo is set diff --git a/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/ASF_Badge_apacheway-purple.png b/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/ASF_Badge_apacheway-purple.png new file mode 100644 index 0000000..ce1d8aa Binary files /dev/null and b/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/ASF_Badge_apacheway-purple.png differ diff --git a/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine-project.png b/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine-project.png deleted file mode 100644 index 6d80184..0000000 Binary files a/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine-project.png and /dev/null differ diff --git a/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine4-project.png b/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine4-project.png deleted file mode 100644 index f19c013..0000000 Binary files a/src/main/resources/archetype-resources/src/main/webapp/resources/ui/skins/default/images/turbine4-project.png and /dev/null differ diff --git a/src/main/resources/archetype-resources/src/main/webapp/templates/app/layouts/Default.vm b/src/main/resources/archetype-resources/src/main/webapp/templates/app/layouts/Default.vm index 9597bcb..93b9c2e 100644 --- a/src/main/resources/archetype-resources/src/main/webapp/templates/app/layouts/Default.vm +++ b/src/main/resources/archetype-resources/src/main/webapp/templates/app/layouts/Default.vm @@ -32,7 +32,7 @@ $page.addScript($ui.getScript("page.js")) <!-- Header --> <header class="w3-container w3-center w3-padding-32 w3-theme"> - <img class="w3-right" src="$ui.image('turbine4-project.png')" /> + <h1 class="w3-right"><img class="w3-right" src="https://www.apache.org/img/feather_glyph_notm.png"; style="width: 50px;">The Apache Turbine project</h1> #if ( $data.getUser().hasLoggedIn() ) #set ( $u = $data.getUser() ) <div class="w3-right"> @@ -51,6 +51,7 @@ $page.addScript($ui.getScript("page.js")) <!-- Footer --> <footer class="w3-bottom"> + <p><img class="w3-left" src="$ui.image('ASF_Badge_apacheway-purple.png')" style="width: 100px;"/></p> <p>Powered by <img src="$ui.image('pb-turbine100px.png')"/></p> </footer> </div>
![https://www.apache.org/img/feather_glyph_notm.png"](https://www.apache.org/img/feather_glyph_notm.png"){kind=link}