11:08 p.m.
Author: dan.j.allen
Date: 2009-12-09 00:08:16 -0500 (Wed, 09 Dec 2009)
New Revision: 5243
Added:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepositoryProducer.java
Removed:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetDatabaseProducer.java
Modified:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepository.java
Log:
correct property replacements
fix EntityManager producer w/ note
Modified: archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-09
03:55:30 UTC (rev 5242)
+++ archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/pom.xml 2009-12-09
05:08:16 UTC (rev 5243)
@@ -1,3 +1,5 @@
+#set( $expr_start = '${' )
+#set( $expr_end = '}' )
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
@@ -18,7 +20,7 @@
To set the jboss.home environment variable the Maven way, set the jboss.home
property in an active profile in
the Maven 2 settings.xml file
-->
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.home>${expr_start}env.JBOSS_HOME${expr_end}</jboss.home>
<jboss.domain>default</jboss.domain>
<!-- The version of Weld extensions in use -->
<weld.extensions.version>1.0.0-CR2</weld.extensions.version>
@@ -29,7 +31,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-extensions-bom</artifactId>
- <version>${weld.extensions.version}</version>
+
<version>${expr_start}weld.extensions.version${expr_end}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -138,8 +140,8 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-maven-plugin</artifactId>
<configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
+ <jbossHome>${expr_start}jboss.home${expr_end}</jbossHome>
+ <serverName>${expr_start}jboss.domain${expr_end}</serverName>
</configuration>
</plugin>
</plugins>
Deleted:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetDatabaseProducer.java
===================================================================
---
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetDatabaseProducer.java 2009-12-09
03:55:30 UTC (rev 5242)
+++
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetDatabaseProducer.java 2009-12-09
05:08:16 UTC (rev 5243)
@@ -1,13 +0,0 @@
-package ${package};
-
-import javax.ejb.Stateless;
-import javax.enterprise.inject.Produces;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-public
-@Stateless
-class WidgetDatabaseProducer
-{
- @PersistenceContext @Produces @WidgetRepository EntityManager em;
-}
Modified:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepository.java
===================================================================
---
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepository.java 2009-12-09
03:55:30 UTC (rev 5242)
+++
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepository.java 2009-12-09
05:08:16 UTC (rev 5243)
@@ -8,6 +8,6 @@
import javax.inject.Qualifier;
@Qualifier
-(a)Target({ElementType.FIELD, ElementType.PARAMETER})
+(a)Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
@Retention(RetentionPolicy.RUNTIME)
public @interface WidgetRepository {}
Copied:
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepositoryProducer.java
(from rev 5242,
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetDatabaseProducer.java)
===================================================================
---
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepositoryProducer.java
(rev 0)
+++
archetypes/trunk/jsf/jee/src/main/resources/archetype-resources/src/main/java/WidgetRepositoryProducer.java 2009-12-09
05:08:16 UTC (rev 5243)
@@ -0,0 +1,21 @@
+package ${package};
+
+import javax.ejb.Stateless;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.Disposes;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+public
+@Stateless
+class WidgetDatabaseProducer
+{
+ // NOTE cannot use producer field because Weld attempts to close EntityManager
+ @PersistenceContext EntityManager em;
+
+ public @Produces @WidgetRepository EntityManager retrieveEntityManager() {
+ return em;
+ }
+
+ public void disposeEntityManager(@Disposes @WidgetRepository EntityManager em) {}
+}