Hibernate plugin does not work when thread context class loader is null

[Jeff Prickett]

Subject says it all. Here is the patch.

Index: 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
===================================================================
RCS file: 
/home/cvspublic/maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java,v
retrieving revision 1.2
diff -u -r1.2 SchemaExportBean.java
--- 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
     30 Nov 2003 21:17:51 -0000      1.2
+++ 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
     28 Feb 2004 05:28:24 -0000
@@ -64,6 +64,8 @@
 import java.util.List;
 import java.util.Properties;

+import com.werken.forehead.Forehead;
+
 import net.sf.hibernate.HibernateException;
 import net.sf.hibernate.cfg.Configuration;
 import net.sf.hibernate.tool.hbm2ddl.SchemaExport;
@@ -274,12 +276,25 @@
       ClassLoader oldClassLoader = currentThread.getContextClassLoader();
       try
       {
-
+         ClassLoader rootLoader = null;
+         if(oldClassLoader == null)
+         {
+            rootLoader = Forehead.getInstance().getClassLoader(
+               "root.maven");
+         }
          File baseDirFile = new File(getBasedir());
          URL[] urls = { baseDirFile.toURL()};
          System.out.println(urls[0]);
-         URLClassLoader newClassLoader =
-            new URLClassLoader(urls, oldClassLoader);
+
+         URLClassLoader newClassLoader = null;
+         if(oldClassLoader != null)
+         {
+            newClassLoader = new URLClassLoader(urls, oldClassLoader);
+         }
+         else
+         {
+            newClassLoader = new URLClassLoader(urls, rootLoader);
+         }
          currentThread.setContextClassLoader(newClassLoader);
          Configuration cfg = getConfiguration();
          SchemaExport schemaExport = getSchemaExport(cfg);
Index: 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
===================================================================
RCS file: 
/home/cvspublic/maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java,v
retrieving revision 1.2
diff -u -r1.2 SchemaExportBean.java
--- 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
     30 Nov 2003 21:17:51 -0000      1.2
+++ 
maven-plugins/hibernate/src/main/org/apache/maven/hibernate/beans/SchemaExportBean.java
     28 Feb 2004 05:28:24 -0000
@@ -64,6 +64,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.werken.forehead.Forehead;
+
 import net.sf.hibernate.HibernateException;
 import net.sf.hibernate.cfg.Configuration;
 import net.sf.hibernate.tool.hbm2ddl.SchemaExport;
@@ -274,12 +276,25 @@
       ClassLoader oldClassLoader = currentThread.getContextClassLoader();
       try
       {
-
+         ClassLoader rootLoader = null;
+         if(oldClassLoader == null)
+         {
+            rootLoader = Forehead.getInstance().getClassLoader(
+               "root.maven");
+         }   
          File baseDirFile = new File(getBasedir());
          URL[] urls = { baseDirFile.toURL()};
          System.out.println(urls[0]);
-         URLClassLoader newClassLoader =
-            new URLClassLoader(urls, oldClassLoader);
+         
+         URLClassLoader newClassLoader = null;
+         if(oldClassLoader != null)
+         {
+            newClassLoader = new URLClassLoader(urls, oldClassLoader);
+         }
+         else
+         {
+            newClassLoader = new URLClassLoader(urls, rootLoader);
+         }   
          currentThread.setContextClassLoader(newClassLoader);
          Configuration cfg = getConfiguration();
          SchemaExport schemaExport = getSchemaExport(cfg);

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]