[portal-commits] JBoss Portal SVN: r12972 - in branches/JBoss_Portal_AS5_Deployer/jems: src/main/org/jboss/portal/jems/hibernate and 1 other directory.

[portal-commits at lists.jboss.org]

Author: mwringe
Date: 2009-03-06 18:21:14 -0500 (Fri, 06 Mar 2009)
New Revision: 12972

Modified:
   branches/JBoss_Portal_AS5_Deployer/jems/.classpath
   branches/JBoss_Portal_AS5_Deployer/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
Log:
Merge JBoss_Portal_Branch_2_7 changes (rev range 12254:12964) into JBoss_Portal_AS5_Deployer branch

Modified: branches/JBoss_Portal_AS5_Deployer/jems/.classpath
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/jems/.classpath	2009-03-06 23:21:11 UTC (rev 12971)
+++ branches/JBoss_Portal_AS5_Deployer/jems/.classpath	2009-03-06 23:21:14 UTC (rev 12972)
@@ -14,7 +14,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossha.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh-1.3.0.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/>
@@ -24,5 +23,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache-jdk50.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/beanshell/lib/bsh.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: branches/JBoss_Portal_AS5_Deployer/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2009-03-06 23:21:11 UTC (rev 12971)
+++ branches/JBoss_Portal_AS5_Deployer/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2009-03-06 23:21:14 UTC (rev 12972)
@@ -240,7 +240,11 @@
          }
       }
       log.debug("Using dialect " + dialectName);
-
+      if ("org.hibernate.dialect.HSQLDialect".equals(dialectName))
+      {
+         log.warn("You are using the file based HSQL database, this is not recommended on a production environment and will not work properly on a clustered environment.");
+      }
+      
       //
       createSessionFactory();
 
@@ -297,7 +301,7 @@
             }
             catch (SQLGrammarException e)
             {
-               // We consider that exception means that the schema deos not exist
+               // We consider that exception means that the schema does not exist
                bad++;
             }
          }