[jboss-svn-commits] JBL Code SVN: r34490 - in labs/jbossforums/branches/forums130P27/forums/src: resources/portal-forums-ha-jbp-sar/conf/hibernate and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 3 17:34:43 EDT 2010
Author: sviluppatorefico
Date: 2010-08-03 17:34:43 -0400 (Tue, 03 Aug 2010)
New Revision: 34490
Removed:
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml
Modified:
labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/jems/SessionFactoryBinder.java
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt
labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt
Log:
resolved the transaction problems. Now we can use JPA in jboss 4.2.3 and 5.1.0. 4.2.3 need an update of entitymanager to 3.4 version and slf4j 1.4.2
Modified: labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/jems/SessionFactoryBinder.java
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/jems/SessionFactoryBinder.java 2010-08-03 18:57:20 UTC (rev 34489)
+++ labs/jbossforums/branches/forums130P27/forums/src/main/org/jboss/portlet/forums/jems/SessionFactoryBinder.java 2010-08-03 21:34:43 UTC (rev 34490)
@@ -297,12 +297,14 @@
}
}
- public void createContent() {
+ public void createContent() throws NamingException {
if (setupResource != null) {
if (setupResource.exists()) {
EntityManager session = null;
+ UserTransaction ut = (UserTransaction) new InitialContext()
+ .lookup("/UserTransaction");
try {
- log.info("Creating database content");
+ log.info("Creating database content");
session = sessionFactory.createEntityManager();
String script = setupResource.asString("UTF-8");
@@ -312,11 +314,20 @@
.getContextClassLoader());
interpreter.setOut(System.out);
interpreter.set("Session", session);
+ ut.begin();
interpreter.eval(script);
+ ut.commit();
} catch (EvalError e) {
log.error("Error in the bsh script", e);
} catch (IllegalStateException e) {
log.error("Cannot load setup script", e);
+ } catch (Exception e) {
+ log.error("Cannot load setup script", e);
+ try {
+ ut.rollback();
+ } catch (SystemException se) {
+ se.printStackTrace();
+ }
} finally {
IOTools.safeClose(session);
}
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt 2010-08-03 18:57:20 UTC (rev 34489)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-jbp-sar/conf/hibernate/setup.txt 2010-08-03 21:34:43 UTC (rev 34490)
@@ -6,15 +6,11 @@
// Luca Stancapiano -- import
import org.jboss.portlet.forums.impl.ForumInstanceImpl;
- tx = Session.getTransaction();
- tx.begin();
-
/* Luca Stancapiano start - I add a new ForumInstanceImpl that contains all
instances of categories.
It is the principal reference for a forum and it has the
history of all forum instances in a portal */
ForumInstanceImpl fii = new ForumInstanceImpl();
- fii.setId(new Integer(1));
fii.setName("First forum");
fii.setCategories(new java.util.ArrayList());
// Luca Stancapiano end
@@ -74,5 +70,4 @@
Session.flush();
//Session.persist(forum1);
//Session.persist(forum2);
- tx.commit();
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt 2010-08-03 18:57:20 UTC (rev 34489)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-ha-sar/conf/hibernate/setup.txt 2010-08-03 21:34:43 UTC (rev 34490)
@@ -6,15 +6,11 @@
// Luca Stancapiano -- import
import org.jboss.portlet.forums.impl.ForumInstanceImpl;
- tx = Session.getTransaction();
- tx.begin();
-
/* Luca Stancapiano start - I add a new ForumInstanceImpl that contains all
instances of categories.
It is the principal reference for a forum and it has the
history of all forum instances in a portal */
ForumInstanceImpl fii = new ForumInstanceImpl();
- fii.setId(new Integer(1));
fii.setName("First forum");
fii.setCategories(new java.util.ArrayList());
// Luca Stancapiano end
@@ -74,4 +70,3 @@
//Session.flush();
//Session.persist(forum1);
//Session.persist(forum2);
- tx.commit();
Modified: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt 2010-08-03 18:57:20 UTC (rev 34489)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-sar/conf/hibernate/setup.txt 2010-08-03 21:34:43 UTC (rev 34490)
@@ -6,15 +6,11 @@
// Luca Stancapiano -- import
import org.jboss.portlet.forums.impl.ForumInstanceImpl;
- tx = Session.getTransaction();
- tx.begin();
-
/* Luca Stancapiano start - I add a new ForumInstanceImpl that contains all
instances of categories.
It is the principal reference for a forum and it has the
history of all forum instances in a portal */
ForumInstanceImpl fii = new ForumInstanceImpl();
- fii.setId(new Integer(1));
fii.setName("First forum");
fii.setCategories(new java.util.ArrayList());
// Luca Stancapiano end
@@ -66,12 +62,9 @@
// Luca Stancapiano start - I save ForumInstance record and all his children records
fii.addCategory(cat);
Session.persist(fii);
- Session.flush(); // Luca Stancapiano - it is required for clustering versions
// Luca Stancapiano end
//
Session.persist(cat);
- Session.flush(); // Luca Stancapiano - it is required for clustering versions
- //Session.persist(forum1);
- //Session.persist(forum2);
- tx.commit();
+ Session.persist(forum1);
+ Session.persist(forum2);
Deleted: labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml 2010-08-03 18:57:20 UTC (rev 34489)
+++ labs/jbossforums/branches/forums130P27/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml 2010-08-03 21:34:43 UTC (rev 34490)
@@ -1,3 +0,0 @@
-<jboss-app>
- <app-name>forums</app-name>
-</jboss-app>
More information about the jboss-svn-commits
mailing list