Fix definizione DatabasePopulator come EJB

This commit is contained in:
Fabio Scotto di Santolo
2019-04-01 12:13:28 +02:00
parent fa1f4fecd3
commit b0d62ac83e
6 changed files with 13 additions and 18 deletions

1
.gitignore vendored
View File

@@ -89,3 +89,4 @@ fabric.properties
# Android studio 3.1+ serialized cache file # Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser .idea/caches/build_file_checksums.ser
/ejbdemo/testdb/

View File

@@ -4,7 +4,9 @@
<facet type="jpa" name="JPA"> <facet type="jpa" name="JPA">
<configuration> <configuration>
<setting name="validation-enabled" value="true" /> <setting name="validation-enabled" value="true" />
<datasource-mapping /> <datasource-mapping>
<factory-entry name="ejbdemoPU" />
</datasource-mapping>
<naming-strategy-map /> <naming-strategy-map />
<deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" /> <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
</configuration> </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: 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: 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.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.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: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
</component> </component>

View File

@@ -38,15 +38,6 @@
<groupId>org.glassfish</groupId> <groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId> <artifactId>javax.el</artifactId>
</dependency> </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> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>

View File

@@ -3,19 +3,19 @@ package it.plague.jeedemo;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import javax.annotation.sql.DataSourceDefinition; import javax.annotation.sql.DataSourceDefinition;
import javax.ejb.Singleton;
import javax.ejb.Startup; import javax.ejb.Startup;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject; import javax.inject.Inject;
@Startup @Startup
@ApplicationScoped @Singleton
@DataSourceDefinition( @DataSourceDefinition(
className = "org.apache.derby.jdbc.EmbeddedDataSource", className = "org.apache.derby.jdbc.EmbeddedDataSource",
name = "java:global/jdbc/ejbdemoDS", name = "java:global/jdbc/ejbdemoDS",
user = "APP", user = "APP",
password = "APP", password = "APP",
databaseName = "ejbdemo", databaseName = "testdb",
properties = {"connectionAttributes=;create=true"}) properties = {"connectionAttributes=;create=true"})
public class DatabasePopulator { public class DatabasePopulator {

View File

@@ -4,7 +4,10 @@
<facet type="jpa" name="JPA"> <facet type="jpa" name="JPA">
<configuration> <configuration>
<setting name="validation-enabled" value="true" /> <setting name="validation-enabled" value="true" />
<datasource-mapping /> <datasource-mapping>
<factory-entry name="jpademoTestUnit" />
<factory-entry name="jpademoUnit" />
</datasource-mapping>
<naming-strategy-map /> <naming-strategy-map />
<deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" /> <deploymentDescriptor name="persistence.xml" url="file://$MODULE_DIR$/src/main/resources/META-INF/persistence.xml" />
</configuration> </configuration>

View File

@@ -51,7 +51,7 @@
<dependency> <dependency>
<groupId>org.glassfish.main.extras</groupId> <groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId> <artifactId>glassfish-embedded-all</artifactId>
<version>4.1</version> <version>4.1.2</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>