From b0d62ac83e470f9ed324c55818a91ece10973fff Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fabio.scottodisantolo@gmail.com>
Date: Mon, 1 Apr 2019 12:13:28 +0200
Subject: [PATCH] Fix definizione DatabasePopulator come EJB

---
 .gitignore                                               | 1 +
 ejbdemo/ejbdemo.iml                                      | 8 ++++----
 ejbdemo/pom.xml                                          | 9 ---------
 .../main/java/it/plague/jeedemo/DatabasePopulator.java   | 6 +++---
 jpademo/jpademo.iml                                      | 5 ++++-
 pom.xml                                                  | 2 +-
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index a3faa8c..0bede59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+/ejbdemo/testdb/
diff --git a/ejbdemo/ejbdemo.iml b/ejbdemo/ejbdemo.iml
index eb85289..d94b47a 100644
--- a/ejbdemo/ejbdemo.iml
+++ b/ejbdemo/ejbdemo.iml
@@ -4,7 +4,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="ejbdemoPU" />
+        </datasource-mapping>
         <naming-strategy-map />
         <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
       </configuration>
@@ -34,10 +36,8 @@
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.1-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.derby:derbyclient:10.9.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.derby:derby:10.9.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.main.extras:glassfish-embedded-all:4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish.main.extras:glassfish-embedded-all:4.1.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
diff --git a/ejbdemo/pom.xml b/ejbdemo/pom.xml
index ad6d1d7..b5408c4 100644
--- a/ejbdemo/pom.xml
+++ b/ejbdemo/pom.xml
@@ -38,15 +38,6 @@
       <groupId>org.glassfish</groupId>
       <artifactId>javax.el</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derbyclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
diff --git a/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java b/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
index 7dd5b01..9c5ab0c 100644
--- a/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
+++ b/ejbdemo/src/main/java/it/plague/jeedemo/DatabasePopulator.java
@@ -3,19 +3,19 @@ package it.plague.jeedemo;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.sql.DataSourceDefinition;
+import javax.ejb.Singleton;
 import javax.ejb.Startup;
-import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 
 @Startup
-@ApplicationScoped
+@Singleton
 @DataSourceDefinition(
     className = "org.apache.derby.jdbc.EmbeddedDataSource",
     name = "java:global/jdbc/ejbdemoDS",
     user = "APP",
     password = "APP",
-    databaseName = "ejbdemo",
+    databaseName = "testdb",
     properties = {"connectionAttributes=;create=true"})
 public class DatabasePopulator {
 
diff --git a/jpademo/jpademo.iml b/jpademo/jpademo.iml
index 13d6ecc..43e53ae 100644
--- a/jpademo/jpademo.iml
+++ b/jpademo/jpademo.iml
@@ -4,7 +4,10 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="jpademoTestUnit" />
+          <factory-entry name="jpademoUnit" />
+        </datasource-mapping>
         <naming-strategy-map />
         <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
       </configuration>
diff --git a/pom.xml b/pom.xml
index b11af7c..99ef36d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
       <dependency>
         <groupId>org.glassfish.main.extras</groupId>
         <artifactId>glassfish-embedded-all</artifactId>
-        <version>4.1</version>
+        <version>4.1.2</version>
         <scope>provided</scope>
       </dependency>
       <dependency>