1:54 a.m.
Author: dstephan
Date: 2009-10-09 02:54:08 -0400 (Fri, 09 Oct 2009)
New Revision: 17674
Added:
sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml
Modified:
sandbox/trunk/lobtest-ee5/lobtest-ejb/lobtestdb-ds.xml
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/LobTestServiceBean.java
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/hibernate.cfg.xml
sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp
Log:
Updated to run on EAP5
Added: sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml
(rev 0)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/hibernate-service.xml 2009-10-09 06:54:08 UTC
(rev 17674)
@@ -0,0 +1,38 @@
+<?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>
+
+
+</mbean>
+
+</server>
+
Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/lobtestdb-ds.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/lobtestdb-ds.xml 2009-10-09 05:07:28 UTC (rev
17673)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/lobtestdb-ds.xml 2009-10-09 06:54:08 UTC (rev
17674)
@@ -2,7 +2,7 @@
<datasources>
<local-tx-datasource>
<jndi-name>LobTestDS</jndi-name>
- <connection-url>jdbc:hsqldb:mem:lobtest</connection-url>
+
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}/hypersonic/localDB</connection-url>
<driver-class>org.hsqldb.jdbcDriver</driver-class>
<user-name>sa</user-name>
<password></password>
Modified:
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/LobTestServiceBean.java
===================================================================
---
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/LobTestServiceBean.java 2009-10-09
05:07:28 UTC (rev 17673)
+++
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/LobTestServiceBean.java 2009-10-09
06:54:08 UTC (rev 17674)
@@ -24,7 +24,8 @@
private static final String DESCRIPTION = "Long description requiring more space
than I have time to consume.";
private static final byte[] IMAGE_DATA = { 'E', 'A', 'D',
'G', 'B', 'E' };
- @PersistenceContext(name="lobtest-jpa") private EntityManager em;
+ @PersistenceContext//(name="lobtest-jpa")
+ private EntityManager em;
public void runTests() {
// CLOB
Modified:
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java
===================================================================
---
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2009-10-09
05:07:28 UTC (rev 17673)
+++
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingService.java 2009-10-09
06:54:08 UTC (rev 17674)
@@ -6,7 +6,7 @@
public interface ThingService {
- public void setUp();
+ public Thing setUp();
public List<Thing> findAllThingsHibernate();
@@ -15,5 +15,6 @@
public List<Thing> findAllThingsJPA();
public Thing findThingJPA(Long id);
+
}
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-09
05:07:28 UTC (rev 17673)
+++
sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/java/com/redhat/gss/lobtest/ejb/ThingServiceBean.java 2009-10-09
06:54:08 UTC (rev 17674)
@@ -29,16 +29,20 @@
public Thing findThingHibernate(Long id) {
Session s = HibernateUtil.getSession();
- return (Thing) s.load(Thing.class, id);
+ Thing t = (Thing) s.load(Thing.class, id);
+ System.out.println("Thing: id=" + t.getId() + " name=" +
t.getName() + " class=" + t.getClass());
+ s.close();
+ return t;
}
public Thing findThingJPA(Long id) {
return em.getReference(Thing.class, id);
}
- public void setUp() {
+ public Thing setUp() {
Thing t1 = new Thing(System.currentTimeMillis(), "One");
em.persist(t1);
+ return t1;
}
}
Modified: sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/hibernate.cfg.xml
===================================================================
--- sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/hibernate.cfg.xml 2009-10-09
05:07:28 UTC (rev 17673)
+++ sandbox/trunk/lobtest-ee5/lobtest-ejb/src/main/resources/hibernate.cfg.xml 2009-10-09
06:54:08 UTC (rev 17674)
@@ -4,7 +4,7 @@
"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
<hibernate-configuration>
<session-factory name="lobtest-hibernate">
- <property
name="hibernate.connection.datasource">java:/DefaultDS</property>
+ <property
name="hibernate.connection.datasource">java:/LobTestDS</property>
<property
name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
<property name="hibernate.hbm2ddl.auto">create-drop</property>
<property
name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
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-09 05:07:28
UTC (rev 17673)
+++ sandbox/trunk/lobtest-ee5/lobtest-web/src/main/webapp/basic.jsp 2009-10-09 06:54:08
UTC (rev 17674)
@@ -1,10 +1,13 @@
<%@page import="javax.naming.InitialContext"%>
<%@page import="com.redhat.gss.lobtest.ejb.ThingService"%>
+<%@page import="com.redhat.gss.lobtest.jpa.Thing"%>
<%
InitialContext ctx = new InitialContext();
ThingService ts = (ThingService)
ctx.lookup("lobtest/ThingServiceBean/local");
- ts.setUp();
+ Thing t = ts.setUp();
out.print("Tests set up.</br>");
ts.findAllThingsHibernate();
+ ts.findThingHibernate(t.getId());
%>
+
Tests run successfully.