Skip to content
Snippets Groups Projects
Commit ce1283ee authored by jez04's avatar jez04
Browse files

fix: error in script, add deployment script

parent 922cab25
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 48 additions and 13 deletions
create-archetype-and-deploy-to-mvn-central.sh 0 → 100755
+ 30
− 0
View file @ ce1283ee
#!/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
create-archetype-and-install.sh
+ 1
− 0
View file @ ce1283ee
...@@ -16,6 +16,7 @@ sed -i "s/<warName>jakarta-jsf-quickstart<\/warName>/<warName>\${artifactId}<\/w ...@@ -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 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 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-install.sh
rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/create-archetype-and-deploy-to-mvn-central.sh
echo Rmoving partial pom echo Rmoving partial pom
rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/partial-archetype-pom.xml rm $GENERATED_ARCHETYPE_ROOT/src/main/resources/archetype-resources/partial-archetype-pom.xml
echo Rmoving eclipse project files echo Rmoving eclipse project files
......
pom.xml
+ 1
− 1
View file @ ce1283ee
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.github.jez04-cs</groupId> <groupId>io.github.jez04-cs</groupId>
<artifactId>jakarta-jsf-quickstart</artifactId> <artifactId>jakarta-jsf-quickstart</artifactId>
<version>1.0.0</version> <version>1.0.2</version>
<packaging>war</packaging> <packaging>war</packaging>
......
src/main/java/cz/vsb/fei/java/repositoris/PersonRepository.java
+ 1
− 2
View file @ ce1283ee
...@@ -42,7 +42,6 @@ public class PersonRepository implements Serializable { ...@@ -42,7 +42,6 @@ public class PersonRepository implements Serializable {
} }
public Person refresh(Person person) { public Person refresh(Person person) {
Person p = em.find(Person.class, person.getId()); return em.find(Person.class, person.getId());
return p;
} }
} }
src/main/java/cz/vsb/fei/java/transactionalscripts/PersonTS.java
+ 7
− 7
View file @ ce1283ee
...@@ -20,13 +20,13 @@ public class PersonTS implements Serializable { ...@@ -20,13 +20,13 @@ public class PersonTS implements Serializable {
@PostConstruct @PostConstruct
public void init() { public void init() {
Person aa = new Person("aa"); Person ada = new Person("Ada Lovelace");
Person bb = new Person("bb"); Person alan = new Person("Alan Turing");
Person cc = new Person("cc", aa); Person john = new Person("John J. Hopfield", ada);
save(aa); save(ada);
save(bb); save(alan);
save(cc); save(john);
log.info("Default data initialized"); log.info("Default data initialized.");
} }
public Person save(Person entity) { public Person save(Person entity) {
......
src/main/resources/META-INF/maven/archetype-metadata.xml
+ 1
− 1
View file @ ce1283ee
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<fileSet filtered="true" encoding="UTF-8"> <fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
<excludes> <excludes>
<exclude>**</exclude> <exclude>META-INF/maven/**</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet filtered="true" encoding="UTF-8"> <fileSet filtered="true" encoding="UTF-8">
......
src/main/webapp/index.xhtml
+ 7
− 2
View file @ ce1283ee
...@@ -13,8 +13,13 @@ ...@@ -13,8 +13,13 @@
</h:head> </h:head>
<body> <body>
<h2> <h2>
<h:outputText value="#{helloController.greeting}" /> from application javaee-wildfly-archetype <h:outputText value="#{helloController.greeting}" /> from application javaee-wildfly-archetype
</h2> </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> </body>
</html> </html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment