From 335b08a25638aae16e7bddcbda3b88355e9bfbd4 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 6 Apr 2016 15:49:08 +0200
Subject: [PATCH] Archetype updates, persistence.xml namespace update
---
Doc/Persist/topics.xml | 2 +-
.../src/main/resources/META-INF/persistence.xml | 2 +-
.../src/main/resources/META-INF/persistence.xml | 2 +-
ws/Archetypes/Makefile | 10 +++++-----
ws/Archetypes/archetype-catalog.xml | 9 ++++++++-
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/Doc/Persist/topics.xml b/Doc/Persist/topics.xml
index 9559db9b6..eea2e689e 100644
--- a/Doc/Persist/topics.xml
+++ b/Doc/Persist/topics.xml
@@ -160,7 +160,7 @@ public class Airline {
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
- http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/persistence_2_1.xsd">
+ http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<!--
The <code>persistence.xml</code> file configures at least one persistence unit;
diff --git a/P/Persist/Airline/airline_basic/src/main/resources/META-INF/persistence.xml b/P/Persist/Airline/airline_basic/src/main/resources/META-INF/persistence.xml
index 58baaec49..0f5a9a551 100644
--- a/P/Persist/Airline/airline_basic/src/main/resources/META-INF/persistence.xml
+++ b/P/Persist/Airline/airline_basic/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
- http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/persistence_2_1.xsd">
+ http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<!--
The <code>persistence.xml</code> file configures at least one persistence unit;
diff --git a/P/Persist/Airline/airline_key/src/main/resources/META-INF/persistence.xml b/P/Persist/Airline/airline_key/src/main/resources/META-INF/persistence.xml
index 58baaec49..0f5a9a551 100644
--- a/P/Persist/Airline/airline_key/src/main/resources/META-INF/persistence.xml
+++ b/P/Persist/Airline/airline_key/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
- http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/persistence/persistence_2_1.xsd">
+ http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<!--
The <code>persistence.xml</code> file configures at least one persistence unit;
diff --git a/ws/Archetypes/Makefile b/ws/Archetypes/Makefile
index 521fec20d..f67d3d2bb 100644
--- a/ws/Archetypes/Makefile
+++ b/ws/Archetypes/Makefile
@@ -1,4 +1,4 @@
-ARCHETYPES=mi-maven-archetype-javafxml mi-maven-archetype-quickstart mi-maven-archetype-sax
+ARCHETYPES=mi-maven-archetype-javafxml mi-maven-archetype-quickstart mi-maven-archetype-sax mi-maven-archetype-jpa-hibernate
M2DIR=~/.m2/repository/de/hdm-stuttgart/mi
@@ -6,9 +6,9 @@ $(M2DIR)/%/maven-metadata-local.xml:%/pom.xml
cd $*;mvn install
install: $(foreach aType, $(ARCHETYPES), $(M2DIR)/$(aType)/maven-metadata-local.xml) archetype-catalog.xml
- ssh root@maven.mi.hdm-stuttgart.de mkdir -p /var/www/Archetypes/de/hdm-stuttgart/mi
- $(foreach aType, $(ARCHETYPES), rsync -av --delete -e ssh $(M2DIR)/$(aType) root@maven.mi.hdm-stuttgart.de:/var/www/Archetypes/de/hdm-stuttgart/mi;)
- rsync -av --delete -e ssh index.html archetype-catalog.xml root@maven.mi.hdm-stuttgart.de:/var/www
+ ssh root@maven.mi.hdm-stuttgart.de mkdir -p /var/www/html/maven/Archetypes/de/hdm-stuttgart/mi
+ $(foreach aType, $(ARCHETYPES), rsync -av --delete -e ssh $(M2DIR)/$(aType) root@maven.mi.hdm-stuttgart.de:/var/www/html/maven/Archetypes/de/hdm-stuttgart/mi;)
+ rsync -av --delete -e ssh index.html archetype-catalog.xml root@maven.mi.hdm-stuttgart.de:/var/www/html/maven
clean:
rm -rf $(foreach aType, $(ARCHETYPES), $(M2DIR)/$(aType))
@@ -17,7 +17,7 @@ clean:
done
remoteclean:
- ssh root@maven.mi.hdm-stuttgart.de rm -rf /var/www/Archetypes/de /var/www/index.html /var/www/archetype-catalog.xml
+ ssh root@maven.mi.hdm-stuttgart.de rm -rf /var/www/html/maven/Archetypes/de /var/www/html/maven/index.html /var/www/html/maven/archetype-catalog.xml
#end
diff --git a/ws/Archetypes/archetype-catalog.xml b/ws/Archetypes/archetype-catalog.xml
index 81fc88050..6ef0a9dfd 100644
--- a/ws/Archetypes/archetype-catalog.xml
+++ b/ws/Archetypes/archetype-catalog.xml
@@ -22,7 +22,6 @@
<description>Modified from https://github.com/zonski/javafx-basic-archetype using Java 1.8, log4j 2.x and Junit 4 </description>
</archetype>
-
<archetype>
<groupId>de.hdm-stuttgart.mi</groupId>
<artifactId>mi-maven-archetype-sax</artifactId>
@@ -31,6 +30,14 @@
<description>Sample SAX project using Java 1.8, log4j 2.x and Junit 4</description>
</archetype>
+ <archetype>
+ <groupId>de.hdm-stuttgart.mi</groupId>
+ <artifactId>mi-maven-archetype-jpa-hibernate</artifactId>
+ <version>1.1</version>
+ <repository>https://maven.mi.hdm-stuttgart.de/Archetypes</repository>
+ <description>Sample JPA project including a database populating Junit test.</description>
+ </archetype>
+
</archetypes>
</archetype-catalog>
--
GitLab