--- jboss-portal-2.0.orig/core/build.xml	Fri Jan 28 15:13:15 2005
+++ jboss-portal-2.0/core/build.xml	Fri Feb  4 18:42:23 2005
@@ -48,6 +48,10 @@
    <target name="init" unless="init.disable" depends="_buildmagic:init">
    </target>
 
+	<target name="clobber" depends="clean">
+        <echo message="WARNING: No clobber action defined for core/build.xml"/>
+    </target>
+
    <!--+====================================================================+-->
    <!--| Configuration                                                      |-->
    <!--|                                                                    |-->
@@ -167,8 +171,8 @@
             <path refid="javac.classpath"/>
             <pathelement location="${build.resources}/test" />
             <fileset dir="${build.lib}" includes="portal-core-lib.jar"/>
-            <fileset dir="${jboss.home}/lib" includes="dom4j.jar,commons-logging.jar"/>
-            <fileset dir="${jboss.hibernate.lib}" includes="commons-collections.jar,odmg.jar"/>
+            <path refid="jboss.hibernate.classpath"/>
+            <path refid="dom4j.dom4j.classpath"/>
          </classpath>
       </taskdef>
       <mkdir dir="${build.resources}/setup/"/>
@@ -227,7 +231,7 @@
          <fileset dir="${jboss.portal-cms.root}/lib" includes="portal-cms-lib.sar"/>
          <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
          <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
-         <fileset dir="${javassist.root}/lib" includes="javassist.jar"/>
+         <fileset dir="${javassist.lib}" includes="javassist.jar"/>
          <fileset dir="${jregex.jregex.root}/lib" includes="jregex.jar"/>
          <fileset dir="${jakarta.fileupload.root}/lib" includes="commons-fileupload.jar"/>
          <fileset dir="${jakarta.io.root}/lib" includes="commons-io.jar"/>