From ce1283eeeebd27f6508c36d7dcf569f98175a48c Mon Sep 17 00:00:00 2001
From: jez04 <david.jezek@post.cz>
Date: Thu, 10 Oct 2024 00:09:16 +0200
Subject: [PATCH] fix: error in script, add deployment script
---
create-archetype-and-deploy-to-mvn-central.sh | 30 +++++++++++++++++++
create-archetype-and-install.sh | 1 +
pom.xml | 2 +-
.../java/repositoris/PersonRepository.java | 3 +-
.../java/transactionalscripts/PersonTS.java | 14 ++++-----
.../META-INF/maven/archetype-metadata.xml | 2 +-
src/main/webapp/index.xhtml | 9 ++++--
7 files changed, 48 insertions(+), 13 deletions(-)
create mode 100755 create-archetype-and-deploy-to-mvn-central.sh
diff --git a/create-archetype-and-deploy-to-mvn-central.sh b/create-archetype-and-deploy-to-mvn-central.sh
new file mode 100755
index 0000000..194e5bb
--- /dev/null
+++ b/create-archetype-and-deploy-to-mvn-central.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+mvn clean archetype:create-from-project
+
+GENERATED_ARCHETYPE_ROOT=target/generated-sources/archetype
+
+echo ======Updating archetype ...=========================
+echo Inserting deployment plugins into project pom.xml
+sed -i "/<\/project>/d" "$GENERATED_ARCHETYPE_ROOT/pom.xml"
+cat "partial-archetype-pom.xml" >> "$GENERATED_ARCHETYPE_ROOT/pom.xml"
+echo "</project>" >> "$GENERATED_ARCHETYPE_ROOT/pom.xml"
+sed -i "s/jakarta-jsf-quickstart-archetype/jakarta-jsf-quickstart/g" "$GENERATED_ARCHETYPE_ROOT/pom.xml"
+
+echo Updating archetype template pom.xml
+sed -i "s/<warName>jakarta-jsf-quickstart<\/warName>/<warName>\${artifactId}<\/warName>/g" "$GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/pom.xml"
+cp src/main/resources/META-INF/maven/archetype-metadata.xml $GENERATED_ARCHETYPE_ROOT/src/main/resources/META-INF/maven/archetype-metadata.xml
+echo Rmoving script
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/create-archetype-and-install.sh
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/create-archetype-and-deploy-to-mvn-central.sh
+echo Rmoving partial pom
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/partial-archetype-pom.xml
+echo Rmoving eclipse project files
+rm -R $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/.settings
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/.classpath
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/.project
+echo ======Update archetype done.=========================
+
+cd $GENERATED_ARCHETYPE_ROOT
+mvn -P release clean deploy
+cd ../../..
\ No newline at end of file
diff --git a/create-archetype-and-install.sh b/create-archetype-and-install.sh
index 85a9384..7b28f6b 100755
--- a/create-archetype-and-install.sh
+++ b/create-archetype-and-install.sh
@@ -16,6 +16,7 @@ sed -i "s/<warName>jakarta-jsf-quickstart<\/warName>/<warName>\${artifactId}<\/w
cp src/main/resources/META-INF/maven/archetype-metadata.xml $GENERATED_ARCHETYPE_ROOT/src/main/resources/META-INF/maven/archetype-metadata.xml
echo Rmoving script
rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/create-archetype-and-install.sh
+rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/create-archetype-and-deploy-to-mvn-central.sh
echo Rmoving partial pom
rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/partial-archetype-pom.xml
echo Rmoving eclipse project files
diff --git a/pom.xml b/pom.xml
index 3b83810..0f71738 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.jez04-cs</groupId>
<artifactId>jakarta-jsf-quickstart</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
<packaging>war</packaging>
diff --git a/src/main/java/cz/vsb/fei/java/repositoris/PersonRepository.java b/src/main/java/cz/vsb/fei/java/repositoris/PersonRepository.java
index b62a10a..7582190 100644
--- a/src/main/java/cz/vsb/fei/java/repositoris/PersonRepository.java
+++ b/src/main/java/cz/vsb/fei/java/repositoris/PersonRepository.java
@@ -42,7 +42,6 @@ public class PersonRepository implements Serializable {
}
public Person refresh(Person person) {
- Person p = em.find(Person.class, person.getId());
- return p;
+ return em.find(Person.class, person.getId());
}
}
diff --git a/src/main/java/cz/vsb/fei/java/transactionalscripts/PersonTS.java b/src/main/java/cz/vsb/fei/java/transactionalscripts/PersonTS.java
index 4e29d91..c846a67 100644
--- a/src/main/java/cz/vsb/fei/java/transactionalscripts/PersonTS.java
+++ b/src/main/java/cz/vsb/fei/java/transactionalscripts/PersonTS.java
@@ -20,13 +20,13 @@ public class PersonTS implements Serializable {
@PostConstruct
public void init() {
- Person aa = new Person("aa");
- Person bb = new Person("bb");
- Person cc = new Person("cc", aa);
- save(aa);
- save(bb);
- save(cc);
- log.info("Default data initialized");
+ Person ada = new Person("Ada Lovelace");
+ Person alan = new Person("Alan Turing");
+ Person john = new Person("John J. Hopfield", ada);
+ save(ada);
+ save(alan);
+ save(john);
+ log.info("Default data initialized.");
}
public Person save(Person entity) {
diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml
index 8f43897..0bdc83b 100644
--- a/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,7 +12,7 @@
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<excludes>
- <exclude>**</exclude>
+ <exclude>META-INF/maven/**</exclude>
</excludes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 928affa..58c2105 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -13,8 +13,13 @@
</h:head>
<body>
<h2>
- <h:outputText value="#{helloController.greeting}" /> from application javaee-wildfly-archetype
+ <h:outputText value="#{helloController.greeting}" /> from application javaee-wildfly-archetype
</h2>
- <h:link outcome="persons" value="Persosns table"/>
+ <p>
+ <a href="hello/servlet-works">Link to servlet page hello/servlet-works</a>
+ </p>
+ <p>
+ <h:link outcome="persons" value="Persosns table"/>
+ </p>
</body>
</html>
--
GitLab