Menu
▾
▴
[Hibernate-commits] Hibernate Code SVN: r10015 - in trunk/HibernateExt/tools/src: java/org/hibernate/tool/hbm2x/seam templates/seam test/org/hibernate/tool/ant testsupport
|
From: <hib...@li...> - 2006-06-12 17:01:19
|
Author: max...@jb...
Date: 2006-06-12 13:01:09 -0400 (Mon, 12 Jun 2006)
New Revision: 10015
Added:
trunk/HibernateExt/tools/src/templates/seam/components.xml.ftl
Modified:
trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java
trunk/HibernateExt/tools/src/templates/seam/build.properties.ftl
trunk/HibernateExt/tools/src/templates/seam/persistence.xml.ftl
trunk/HibernateExt/tools/src/templates/seam/seam.properties.ftl
trunk/HibernateExt/tools/src/test/org/hibernate/tool/ant/SeamAntTest.java
trunk/HibernateExt/tools/src/testsupport/anttest-build.xml
trunk/HibernateExt/tools/src/testsupport/seamtest-build.xml
Log:
update seam templates to seam 1.0
Modified: trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java
===================================================================
--- trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/seam/SeamExporter.java 2006-06-12 17:01:09 UTC (rev 10015)
@@ -46,6 +46,7 @@
configureExporter( "seam/build.xml.ftl", "build.xml").start();
configureExporter( "seam/build.properties.ftl", "build.properties").start();
+ configureExporter( "seam/components.xml.ftl", "resources/WEB-INF/components.xml").start();
configureExporter( "seam/readme.txt.ftl", "readme.txt").start();
new File( getOutputDirectory(), "lib" ).mkdir();
Modified: trunk/HibernateExt/tools/src/templates/seam/build.properties.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/build.properties.ftl 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/templates/seam/build.properties.ftl 2006-06-12 17:01:09 UTC (rev 10015)
@@ -1,2 +1,3 @@
##jboss.home = C:/jboss-4.0.4
-##jboss.home = C:/Projects/jboss-head/build/output/jboss-5.0.0alpha
\ No newline at end of file
+##jboss.home = C:/Projects/jboss-head/build/output/jboss-5.0.0alpha
+##jboss.home = c:/Program Files/jboss-4.0.4.GA
\ No newline at end of file
Added: trunk/HibernateExt/tools/src/templates/seam/components.xml.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/components.xml.ftl 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/templates/seam/components.xml.ftl 2006-06-12 17:01:09 UTC (rev 10015)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components>
+
+ <component name="org.jboss.seam.core.init">
+ <property name="myFacesLifecycleBug">true</property>
+ <property name="jndiPattern">${seam_shortname}/${'#'}{ejbName}/local</property>
+ </component>
+
+ <component name="entityManager" class="org.jboss.seam.core.ManagedPersistenceContext">
+ <property name="persistenceUnitJndiName">java:/${seam_shortname}EntityManagerFactory</property>
+ </component>
+
+ <!--
+ <component name="org.jboss.seam.core.manager">
+ <property name="conversationTimeout">120000</property>
+ </component>
+
+ <component class="org.jboss.seam.core.Ejb" installed="false"/>
+ -->
+
+</components>
\ No newline at end of file
Modified: trunk/HibernateExt/tools/src/templates/seam/persistence.xml.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/persistence.xml.ftl 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/templates/seam/persistence.xml.ftl 2006-06-12 17:01:09 UTC (rev 10015)
@@ -8,7 +8,7 @@
<property name="hibernate.transaction.flush_before_completion" value="true"/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
- <property name="jboss.entity.manager.factory.jndi.name" value="java:/entityManager"/>
+ <property name="jboss.entity.manager.factory.jndi.name" value="java:/${seam_shortname}EntityManagerFactory"/>
</properties>
</persistence-unit>
</entity-manager>
\ No newline at end of file
Modified: trunk/HibernateExt/tools/src/templates/seam/seam.properties.ftl
===================================================================
--- trunk/HibernateExt/tools/src/templates/seam/seam.properties.ftl 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/templates/seam/seam.properties.ftl 2006-06-12 17:01:09 UTC (rev 10015)
@@ -1,4 +1,4 @@
# seam.properties
-org.jboss.seam.core.init.managedPersistenceContexts entityManager
+#org.jboss.seam.core.init.managedPersistenceContexts entityManager
#org.jboss.seam.core.manager.conversationTimeout 30000
-org.jboss.seam.core.init.jndiPattern seamapp/#\{ejbName\}/local
\ No newline at end of file
+#org.jboss.seam.core.init.jndiPattern seamapp/#\{ejbName\}/local
\ No newline at end of file
Modified: trunk/HibernateExt/tools/src/test/org/hibernate/tool/ant/SeamAntTest.java
===================================================================
--- trunk/HibernateExt/tools/src/test/org/hibernate/tool/ant/SeamAntTest.java 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/test/org/hibernate/tool/ant/SeamAntTest.java 2006-06-12 17:01:09 UTC (rev 10015)
@@ -35,7 +35,6 @@
protected void tearDown() throws Exception {
- //assertEquals("Method not found errors during template processing:\n " + HibernateUberspect.getMethodErrors(),0,HibernateUberspect.getMethodNotFoundCount());
System.out.println(getLog() );
}
@@ -51,6 +50,7 @@
assertFileAndExists(new File(baseDir, "build.xml"));
assertFileAndExists(new File(baseDir, "resources/seam.properties"));
+ assertFileAndExists(new File(baseDir, "resources/WEB-INF/components.xml"));
validXMLFile( new File(baseDir, "resources/WEB-INF/web.xml") );
Modified: trunk/HibernateExt/tools/src/testsupport/anttest-build.xml
===================================================================
--- trunk/HibernateExt/tools/src/testsupport/anttest-build.xml 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/testsupport/anttest-build.xml 2006-06-12 17:01:09 UTC (rev 10015)
@@ -236,7 +236,6 @@
<target name="prepareCfg2hbm" description="prepare for cfg2hbm tasks">
<sql onerror="continue" driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" userid="${hibernate.connection.username}" password="${hibernate.connection.password}" classpath="${hibernate-core.home}\jdbc\hsqldb.jar">
create table VeriSimplyTable ( id bigint not null, name varchar(255), primary key (id) );
- SHUTDOWN;
</sql>
<delete dir="${build.dir}/cfg2hbm" failonerror="false" />
@@ -246,7 +245,6 @@
<target name="afterCfg2hbm" description="prepare for cfg2hbm tasks">
<sql onerror="continue" driver="${hibernate.connection.driver_class}" url="${hibernate.connection.url}" userid="${hibernate.connection.username}" password="${hibernate.connection.password}" classpath="${hibernate-core.home}\jdbc\hsqldb.jar">
drop table VeriSimplyTable;
- SHUTDOWN;
</sql>
</target>
Modified: trunk/HibernateExt/tools/src/testsupport/seamtest-build.xml
===================================================================
--- trunk/HibernateExt/tools/src/testsupport/seamtest-build.xml 2006-06-12 16:56:27 UTC (rev 10014)
+++ trunk/HibernateExt/tools/src/testsupport/seamtest-build.xml 2006-06-12 17:01:09 UTC (rev 10015)
@@ -5,7 +5,7 @@
<property name="build.dir" location="../../build/seamtest"/>
<property file="../../etc/hibernate.properties"/>
- <delete dir="${build.dir}"/>
+<!-- <delete dir="${build.dir}"/> -->
<property name="destdir" location="${build.dir}/crud"/>
|
