[Hibernate-commits] Hibernate Code SVN: r9985 - in trunk/HibernateExt/tools: lib/testlibs src/templates/seam

[<hib...@li...>]

Author: tho...@jb...
Date: 2006-06-03 16:48:08 -0400 (Sat, 03 Jun 2006)
New Revision: 9985

Modified:
   trunk/HibernateExt/tools/lib/testlibs/README.TXT
   trunk/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
   trunk/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
   trunk/HibernateExt/tools/lib/testlibs/hibernate3.jar
   trunk/HibernateExt/tools/lib/testlibs/jboss-ejb3x.jar
   trunk/HibernateExt/tools/lib/testlibs/jboss-seam.jar
   trunk/HibernateExt/tools/lib/testlibs/myfaces-api.jar
   trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl
   trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl
   trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl
Log:
* Fixed Seam templates
* Updates testlibs with libs from jboss-4.0.4.GA

Modified: trunk/HibernateExt/tools/lib/testlibs/README.TXT
===================================================================
--- trunk/HibernateExt/tools/lib/testlibs/README.TXT	2006-06-03 19:28:50 UTC (rev 9984)
+++ trunk/HibernateExt/tools/lib/testlibs/README.TXT	2006-06-03 20:48:08 UTC (rev 9985)
@@ -2,3 +2,5 @@
 
 Some of these libraries are only here for the purpose of verifying that the 
 generated code can compile.
+
+Jar files from JBoss 4.0.4.GA and jboss-seam-1.0.0.CR3
\ No newline at end of file

Modified: trunk/HibernateExt/tools/lib/testlibs/ejb3-persistence.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/lib/testlibs/hibernate-annotations.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/lib/testlibs/hibernate3.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/lib/testlibs/jboss-ejb3x.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/lib/testlibs/jboss-seam.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/lib/testlibs/myfaces-api.jar
===================================================================
(Binary files differ)

Modified: trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl	2006-06-03 19:28:50 UTC (rev 9984)
+++ trunk/HibernateExt/tools/src/templates/seam/editorbean.java.ftl	2006-06-03 20:48:08 UTC (rev 9985)
@@ -5,7 +5,7 @@
 <#assign entityEditor = pojo.shortName.toLowerCase() + "Editor"><#assign entityFinder = pojo.shortName.toLowerCase() + "Finder"><#assign entityList = pojo.shortName.toLowerCase() + "List"><#assign entity = pojo.shortName.toLowerCase()><#assign entityClass = pojo.importType(pojo.qualifiedDeclarationName)>
 @${pojo.importType("org.jboss.seam.annotations.Name")}("${entityEditor}")
 @${pojo.importType("javax.ejb.Stateful")}
-@${pojo.importType("javax.ejb.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
+@${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
 public class ${pojo.shortName}EditorBean implements ${pojo.shortName}Editor {
 
     @${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
@@ -38,8 +38,8 @@
     @${pojo.importType("org.jboss.seam.annotations.In")}(required=false)
     private transient ${pojo.shortName}Finder ${entityFinder};
 
-    @${pojo.importType("org.jboss.seam.annotations.In")}
-    private transient ${pojo.importType("java.util.ResourceBundle")} resourceBundle;
+    @${pojo.importType("org.jboss.seam.annotations.In")}(create=true)
+    private transient ${pojo.importType("java.util.Map")} messages;
     
     @${pojo.importType("org.jboss.seam.annotations.Begin")}(join=true)
     @${pojo.importType("org.jboss.seam.annotations.IfInvalid")}(outcome=${pojo.importType("org.jboss.seam.annotations.Outcome")}.REDISPLAY)
@@ -48,8 +48,8 @@
        {
           ${pojo.importType("javax.faces.context.FacesContext")}.getCurrentInstance().addMessage(null, 
                 new ${pojo.importType("javax.faces.application.FacesMessage")}(
-                      resourceBundle.getString("${pojo.shortName}_${pojo.identifierProperty.name}") + " " +
-                      resourceBundle.getString("AlreadyExists")
+                      messages.get("${pojo.shortName}_${pojo.identifierProperty.name}") + " " +
+                      messages.get("AlreadyExists")
                    )
              );
           return null;

Modified: trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl	2006-06-03 19:28:50 UTC (rev 9984)
+++ trunk/HibernateExt/tools/src/templates/seam/finderbean.java.ftl	2006-06-03 20:48:08 UTC (rev 9985)
@@ -6,7 +6,7 @@
 @${pojo.importType("org.jboss.seam.annotations.Name")}("${entityFinder}")
 @${pojo.importType("javax.ejb.Stateful")}
 @${pojo.importType("org.jboss.seam.annotations.Scope")}(${pojo.importType("org.jboss.seam.ScopeType")}.SESSION)
-@${pojo.importType("javax.ejb.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
+@${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
 public class ${pojo.shortName}FinderBean implements ${pojo.shortName}Finder {
     
     private ${entityClass} example = new ${entityClass}();

Modified: trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl	2006-06-03 19:28:50 UTC (rev 9984)
+++ trunk/HibernateExt/tools/src/templates/seam/selector.java.ftl	2006-06-03 20:48:08 UTC (rev 9985)
@@ -17,7 +17,7 @@
 
 <#assign entityEditor = pojo.shortName.toLowerCase() + "Editor"><#assign entitySelector = pojo.shortName.toLowerCase() + "Selector"><#assign entityFinder = pojo.shortName.toLowerCase() + "Finder">   @${pojo.importType("javax.ejb.Stateless")}
    @${pojo.importType("org.jboss.seam.annotations.Name")}("${entitySelector}")
-   @${pojo.importType("javax.ejb.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
+   @${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
    public static class Default${pojo.shortName}Selector implements ${pojo.shortName}Selector {
    
       @${pojo.importType("org.jboss.seam.annotations.In")}
@@ -63,7 +63,7 @@
    @${pojo.importType("org.jboss.seam.annotations.Name")}("${childSelector}")
    @${pojo.importType("org.jboss.annotation.ejb.LocalBinding")}(jndiBinding="${childPojo.qualifiedDeclarationName}${pojo.shortName}Selector")
    @${pojo.importType("org.jboss.seam.annotations.JndiName")}("${childPojo.qualifiedDeclarationName}${pojo.shortName}Selector")
-   @${pojo.importType("javax.ejb.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
+   @${pojo.importType("javax.interceptor.Interceptors")}(${pojo.importType("org.jboss.seam.ejb.SeamInterceptor")}.class)
    public static class ${childPojo.shortName}${pojo.shortName}Selector implements ${pojo.shortName}Selector {
       
       @${pojo.importType("org.jboss.seam.annotations.In")}