[hibernate-commits] Hibernate SVN: r17686 - in sandbox/trunk/lobtest-ee5: lobtest-ear and 14 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Sun Oct 11 22:39:49 EDT 2009
Author: dstephan
Date: 2009-10-11 22:39:48 -0400 (Sun, 11 Oct 2009)
New Revision: 17686
Added:
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/hibernate/
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/hibernate/Thing.hbm.xml
sandbox/trunk/lobtest-ee5/lobtest-sar/
sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml
sandbox/trunk/lobtest-ee5/lobtest-sar/src/
sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/
sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/
sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/META-INF/
sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/META-INF/jboss-service.xml
Removed:
sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml
Modified:
sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java
sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp
sandbox/trunk/lobtest-ee5/pom.xml
Log:
Modified to include correct deployment of HibernateService and Test
Modified: sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2009-10-10 16:10:38 UTC (rev 17685)
+++ sandbox/trunk/lobtest-ee5/lobtest-ear/pom.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -21,11 +21,17 @@
<groupId>${parent.groupId}</groupId>
<artifactId>lobtest-ejb</artifactId>
</ejbModule>
+ <ejbModule>
+ <groupId>${parent.groupId}</groupId>
+ <artifactId>lobtest-sar</artifactId>
+ <bundleFileName>lobtest-sar.sar</bundleFileName>
+ </ejbModule>
<webModule>
<groupId>${parent.groupId}</groupId>
<artifactId>lobtest-web</artifactId>
</webModule>
</modules>
+ <applicationXml>${project.build.directory}/application.xml</applicationXml>
</configuration>
</plugin>
</plugins>
@@ -40,6 +46,12 @@
</dependency>
<dependency>
<groupId>${parent.groupId}</groupId>
+ <artifactId>lobtest-sar</artifactId>
+ <version>${parent.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>${parent.groupId}</groupId>
<artifactId>lobtest-web</artifactId>
<version>${parent.version}</version>
<type>war</type>
Deleted: sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml 2009-10-10 16:10:38 UTC (rev 17685)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<server>
-
- <mbean code="org.hibernate.jmx.HibernateService"
- name="jboss.jca:service=HibernateFactory,name=HibernateFactory">
-
- com.redhat.gss.lobtest.jpa.Thing
-
- <depends>jboss.jca:service=RARDeployer
- </depends>
- <depends>jboss.jca:service=LocalTxCM,name=DefaultDS
- </depends>
-
- <!-- Bind the Hibernate service to JNDI -->
- <attribute name="JndiName">java:/hibernate/SessionFactory
- </attribute>
- <!-- hibernate dialect -->
-
- <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect
- </property>
- <attribute name="Dialect">org.hibernate.dialect.HSQLDialect
- </attribute>
-
-
- <attribute name="Datasource">java:DefaultDS</attribute>
-
- <!-- DataSource properties (end) -->
-
- <!-- JTA transaction properties (begin) -->
- <attribute name="TransactionStrategy">
- org.hibernate.transaction.JTATransactionFactory</attribute>
- <attribute name="TransactionManagerLookupStrategy">
- org.hibernate.transaction.JBossTransactionManagerLookup</attribute>
- <attribute name="FlushBeforeCompletionEnabled">true</attribute>
- <attribute name="AutoCloseSessionEnabled">true</attribute>
-
- <!-- Simple memory-only cache -->
- <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider
- </property>
-
-
- </mbean>
-
-</server>
-
Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2009-10-10 16:10:38 UTC (rev 17685)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2009-10-12 02:39:48 UTC (rev 17686)
@@ -47,19 +47,12 @@
{
Thing t = null;
Session s = null;
- try
- {
- InitialContext ctx = new InitialContext();
- SessionFactory sf = (SessionFactory) ctx.lookup("java:hibernate/SessionFactory");
- s = sf.getCurrentSession();
+ InitialContext ctx = new InitialContext();
+ SessionFactory sf = (SessionFactory) ctx.lookup("java:hibernate/SessionFactory");
+ s = sf.getCurrentSession();
- t = (Thing) s.load(Thing.class, id);
- System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass());
- }
- finally
- {
- s.close();
- }
+ t = (Thing) s.load(Thing.class, id);
+ System.out.println("Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass());
return t;
}
Added: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/hibernate/Thing.hbm.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/hibernate/Thing.hbm.xml (rev 0)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/com/redhat/gss/lobtest/hibernate/Thing.hbm.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+ <class name="com.redhat.gss.lobtest.jpa.Thing" >
+ <id name="id"/>
+ <property name="name" />
+ </class>
+</hibernate-mapping>
\ No newline at end of file
Added: sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml (rev 0)
+++ sandbox/trunk/lobtest-ee5/lobtest-sar/pom.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -0,0 +1,73 @@
+<?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">
+ <parent>
+ <artifactId>lobtest-ee5</artifactId>
+ <groupId>gss</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>lobtest-sar</artifactId>
+
+ <name>LOB Test SAR</name>
+ <!-- <build>
+ <plugins>
+ <plugin>
+ <groupId>net.sf.maven-sar</groupId>
+ <artifactId>maven-sar-plugin</artifactId>
+ <version>1.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>-->
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.4.sp1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.2.1.ga</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jta</artifactId>
+ <version>1.0.1B-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/META-INF/jboss-service.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/META-INF/jboss-service.xml (rev 0)
+++ sandbox/trunk/lobtest-ee5/lobtest-sar/src/main/resources/META-INF/jboss-service.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<server>
+
+ <mbean code="org.hibernate.jmx.HibernateService" name="jboss.jca:service=HibernateFactory,name=HibernateFactory">
+
+ <depends>jboss.jca:service=RARDeployer</depends>
+ <depends>jboss.jca:service=LocalTxCM,name=DefaultDS</depends>
+
+ <!-- Bind the Hibernate service to JNDI -->
+ <attribute name="JndiName">java:/hibernate/SessionFactory</attribute>
+ <!-- hibernate dialect -->
+
+ <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
+ <attribute name="Dialect">org.hibernate.dialect.HSQLDialect</attribute>
+
+
+ <attribute name="Datasource">java:DefaultDS</attribute>
+
+ <!-- DataSource properties (end) -->
+
+ <!-- JTA transaction properties (begin) -->
+ <attribute name="TransactionStrategy">org.hibernate.transaction.JTATransactionFactory</attribute>
+ <attribute name="TransactionManagerLookupStrategy">org.hibernate.transaction.JBossTransactionManagerLookup</attribute>
+ <attribute name="FlushBeforeCompletionEnabled">true</attribute>
+ <attribute name="AutoCloseSessionEnabled">true</attribute>
+
+ <!-- Simple memory-only cache -->
+ <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <attribute name="MapResources">com/redhat/gss/lobtest/hibernate/Thing.hbm.xml</attribute>
+ </mbean>
+
+</server>
+
Modified: sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2009-10-10 16:10:38 UTC (rev 17685)
+++ sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2009-10-12 02:39:48 UTC (rev 17686)
@@ -20,7 +20,7 @@
t = ts.findThingJPA(t.getId());
System.out.println("basic.jsp from ts.findThingJPA(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass());
- //t = ts.findThingHibernateMBean(t.getId());
- //System.out.println("basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass());
+ t = ts.findThingHibernateMBean(t.getId());
+ System.out.println("basic.jsp from ts.findThingHibernateMBean(): Thing: id=" + t.getId() + " name=" + t.getName() + " class=" + t.getClass());
%>
Tests run successfully.
Modified: sandbox/trunk/lobtest-ee5/pom.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/pom.xml 2009-10-10 16:10:38 UTC (rev 17685)
+++ sandbox/trunk/lobtest-ee5/pom.xml 2009-10-12 02:39:48 UTC (rev 17686)
@@ -9,6 +9,7 @@
<name>LOB Test EE5 Parent</name>
<modules>
<module>lobtest-ejb</module>
+ <module>lobtest-sar</module>
<module>lobtest-web</module>
<module>lobtest-ear</module>
</modules>
More information about the hibernate-commits
mailing list