[jboss-svn-commits] JBL Code SVN: r19413 - in labs/jbossforums/branches/multipleforums110P26/forums/src: resources/portal-forums-ear/META-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2008-04-04 08:00:10 -0400 (Fri, 04 Apr 2008)
New Revision: 19413

Modified:
   labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java
   labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java
   labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
Log:
[JBFORUMS-274] Fixes for standalone Forums.

Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java	2008-04-04 11:33:42 UTC (rev 19412)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/BeginTransactionListener.java	2008-04-04 12:00:10 UTC (rev 19413)
@@ -79,7 +79,10 @@
         try
         {
            UserTransaction tx = (UserTransaction) ctx.lookup(USER_TRANSACTION_JNDI);
-           tx.begin();                      
+           if (tx.getStatus()!=javax.transaction.Status.STATUS_ACTIVE)
+           {
+               tx.begin();
+           }
         }
         catch (Throwable t)
         {

Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java	2008-04-04 11:33:42 UTC (rev 19412)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/main/org/jboss/portlet/forums/ui/event/EndTransactionListener.java	2008-04-04 12:00:10 UTC (rev 19413)
@@ -121,6 +121,8 @@
             {
 	            try
 	            {
+	                if (tx.getStatus()==javax.transaction.Status.STATUS_ACTIVE)
+	                {
 		            if(rollback)
 		            {
 		                tx.rollback();
@@ -129,6 +131,7 @@
 		            {
 		                tx.commit();
 		            }
+	                }
 	            }
 	            catch(Exception e)
 	            {

Modified: labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-ear/META-INF/security-config.xml
===================================================================
--- labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2008-04-04 11:33:42 UTC (rev 19412)
+++ labs/jbossforums/branches/multipleforums110P26/forums/src/resources/portal-forums-ear/META-INF/security-config.xml	2008-04-04 12:00:10 UTC (rev 19413)
@@ -23,12 +23,15 @@
 <policy>
 	<application-policy name="forums">       
        <authentication>
-<login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">             <module-option name="unauthenticatedIdentity">guest</module-option>
-	<module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
-	<module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
-	<module-option name="additionalRole">Authenticated</module-option>
-	<module-option name="password-stacking">useFirstPass</module-option>
-</login-module>
-</authentication>
-</application-policy>
+          <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
+            <module-option name="unauthenticatedIdentity">guest</module-option>
+            <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+            <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+            <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+            <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
+            <module-option name="additionalRole">Authenticated</module-option>
+            <module-option name="password-stacking">useFirstPass</module-option>
+         </login-module>
+       </authentication>
+    </application-policy>
 </policy>