diff -Nbaur --exclude-from=/tmp/portal.excludes jboss-portal-2.0.orig/tools/etc/buildfragments/libraries.ent jboss-portal-2.0/tools/etc/buildfragments/libraries.ent
--- jboss-portal-2.0.orig/tools/etc/buildfragments/libraries.ent	Thu Jan 27 10:47:29 2005
+++ jboss-portal-2.0/tools/etc/buildfragments/libraries.ent	Fri Feb  4 07:33:39 2005
@@ -1,18 +1,43 @@
 <!-- $Id: libraries.ent,v 1.3 2005/01/27 09:47:29 theute Exp $ -->
 
+<!-- helper to get all libs in a certain directory -->
+<patternset id="libs">
+    <include name="*.jar"/>
+    <include name="*.zip"/>
+</patternset>
+
 <target name="libraries" depends="configure-libraries"/>
 
-<target name="configure-libraries" unless="configure-libraries.disable">
+<target name="configure-libraries" unless="configure-libraries.disable" depends="ant-contribs.load">
 
   <!-- Apache Ant -->
+	<if>
+		<available file="${env.ANT_HOME}" type="dir"/>
+		<then>
+			<property name="apache.ant.root" value="${env.ANT_HOME}"/>
+		</then>
+		<else>
   <property name="apache.ant.root" value="${project.tools}"/>
+		</else>
+	</if>
   <property name="apache.ant.lib" value="${apache.ant.root}/lib"/>
+	<echo message="Ant home = ${apache.ant.root}"/>
   <path id="apache.ant.classpath">
-    <filelist dir="${apache.ant.lib}" files="ant.jar"/>
+		<fileset dir="${apache.ant.lib}">
+			<patternset refid="libs"/>
+		</fileset>
   </path>
 
   <!-- Jakarta Log4j -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+			<property name="jakarta.log4j.root" value="${jboss.home}/server/all"/>
+		</then>
+		<else>
   <property name="jakarta.log4j.root" value="${project.thirdparty}/jakarta-log4j"/>
+		</else>
+	</if>
   <property name="jakarta.log4j.lib" value="${jakarta.log4j.root}/lib"/>
   <path id="jakarta.log4j.classpath">
     <filelist dir="${jakarta.log4j.lib}" files="log4j.jar"/>
@@ -26,6 +51,21 @@
   </path>
 
   <!-- Hibernate -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+			<property name="jboss.hibernate.root" value="${jboss.home}/server/all/deploy/jboss-hibernate.deployer"/>
+			<property name="jboss.hibernate.lib" value="${jboss.home}/server/all/deploy/jboss-hibernate.deployer"/>
+			<path id="jboss.hibernate.classpath">
+				<fileset dir="${jboss.hibernate.lib}">
+					<patternset refid="libs"/>
+				</fileset>
+				<!-- wondering, why this one is installed for tomcat, only ? -->
+				<filelist dir="${jboss.home}/server/all/deploy/jbossweb-tomcat50.sar" files="commons-collections.jar"/>
+				<filelist dir="${jboss.home}/server/all" files="commons-logging.jar"/>
+			</path>
+		</then>
+		<else>
   <property name="jboss.hibernate.root" value="${project.thirdparty}/jboss-hibernate"/>
   <property name="jboss.hibernate.lib" value="${jboss.hibernate.root}/lib"/>
   <path id="jboss.hibernate.classpath">
@@ -36,6 +76,8 @@
     <filelist dir="${jboss.hibernate.lib}" files="odmg.jar"/>
     <filelist dir="${jboss.hibernate.lib}" files="jboss-hibernate.jar"/>
   </path>
+		</else>
+	</if>
 
   <!-- JUnit -->
   <property name="junit.junit.root" value="${project.thirdparty}/junit-junit"/>
@@ -49,22 +91,37 @@
   <property name="xdoclet.xdoclet.root" value="${project.thirdparty}/xdoclet-xdoclet"/>
   <property name="xdoclet.xdoclet.lib" value="${xdoclet.xdoclet.root}/lib"/>
   <path id="xdoclet.xdoclet.classpath">
-    <filelist dir="${xdoclet.xdoclet.lib}" files="commons-collections-2.0.jar,commons-logging.jar,xdoclet.jar,xdoclet-xjavadoc.jar,xdoclet-ejb-module.jar,xdoclet-java-module.jar,xdoclet-jboss-module.jar,xdoclet-hibernate-module.jar,xdoclet-jmx-module.jar,xdoclet-porltet-module.jar,xdoclet-web-module.jar,xdoclet-xdoclet-module.jar"/>
+    <filelist dir="${xdoclet.xdoclet.lib}" files="commons-collections-2.0.jar,commons-logging.jar,xdoclet.jar,xdoclet-xjavadoc.jar,xdoclet-ejb-module.jar,xdoclet-java-module.jar,xdoclet-jboss-module.jar,xdoclet-hibernate-module.jar,xdoclet-jmx-module.jar,xdoclet-portlet-module.jar,xdoclet-web-module.jar,xdoclet-xdoclet-module.jar"/>
     <!--<path refid="apache.commons.classpath"/>-->
   </path>
 
   <!-- Sun servlet -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="sun.servlet.root" value="${jboss.home}/server/all"/>
+  			<property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
+			<path id="sun.servlet.classpath">
+				<filelist dir="${sun.servlet.lib}" files="javax.servlet.jar"/>
+				<filelist dir="${sun.servlet.lib}" files="javax.servlet.jsp.jar"/>
+			</path>
+		</then>
+		<else>
   <property name="sun.servlet.root" value="${project.thirdparty}/sun-servlet"/>
   <property name="sun.servlet.lib" value="${sun.servlet.root}/lib"/>
   <path id="sun.servlet.classpath">
     <filelist dir="${sun.servlet.lib}" files="servlet-api.jar,jsp-api.jar"/>
   </path>
+		</else>
+	</if>
 
   <!-- Cactus -->
   <property name="jakarta.cactus.root" value="${project.thirdparty}/jakarta-cactus"/>
   <property name="jakarta.cactus.lib" value="${jakarta.cactus.root}/lib"/>
   <path id="jakarta.cactus.classpath">
     <filelist dir="${jakarta.cactus.lib}" files="cactus.jar, cactus-ant.jar, commons-httpclient.jar, commons-logging.jar, aspectjrt.jar"/>
+	<path refid="junit.junit.classpath"/>
+	
   </path>
 
   <!-- JavaCC -->
@@ -79,8 +136,17 @@
   </path>
 
   <!-- Javassist -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="javassist.root" value="${jboss.home}/server/all/deploy/jboss-aop.deployer"/>
+  			<property name="javassist.lib" value="${javassist.root}"/>
+		</then>
+		<else>
   <property name="javassist.root" value="${project.thirdparty}/jboss-javassist"/>
   <property name="javassist.lib" value="${javassist.root}/lib"/>
+		</else>
+	</if>
   <path id="javassist.classpath">
     <pathelement path="${javassist.lib}/javassist.jar"/>
   </path>
@@ -93,7 +159,15 @@
   </path>
 
   <!-- Dom4j -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+			<property name="dom4j.dom4j.root" value="${jboss.home}"/>
+		</then>
+		<else>
   <property name="dom4j.dom4j.root" value="${project.thirdparty}/dom4j-dom4j"/>
+		</else>
+	</if>
   <property name="dom4j.dom4j.lib" value="${dom4j.dom4j.root}/lib"/>
   <path id="dom4j.dom4j.classpath">
     <pathelement path="${dom4j.dom4j.lib}/dom4j.jar"/>
@@ -121,35 +195,76 @@
   </path>
 
   <!-- Mail -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+			<property name="sun.mail.root" value="${jboss.home}/server/all"/>
+		</then>
+		<else>
   <property name="sun.mail.root" value="${project.thirdparty}/sun-javamail"/>
+		</else>
+	</if>
   <property name="sun.mail.lib" value="${sun.mail.root}/lib"/>
   <path id="sun.mail.classpath">
     <pathelement path="${sun.mail.lib}/mail.jar"/>
   </path>
 
   <!-- IO -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="oswego.concurrent.root" value="${jboss.home}"/>
+		</then>
+		<else>
   <property name="oswego.concurrent.root" value="${project.thirdparty}/oswego-concurrent"/>
+		</else>
+	</if>
   <property name="oswego.concurrent.lib" value="${oswego.concurrent.root}/lib"/>
   <path id="oswego.concurrent.classpath">
     <pathelement path="${oswego.concurrent.lib}/concurrent.jar"/>
   </path>
 
   <!-- JBoss Server -->
+
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="jboss.server.root" value="${jboss.home}/server/all"/>
+		</then>
+		<else>
   <property name="jboss.server.root" value="${project.thirdparty}/jboss-server"/>
+		</else>
+	</if>
   <property name="jboss.server.lib" value="${jboss.server.root}/lib"/>
   <path id="jboss.server.classpath">
     <pathelement path="${jboss.server.lib}/jboss.jar"/>
   </path>
 
   <!-- JBoss J2EE -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="jboss.j2ee.root" value="${jboss.home}/server/all"/>
+		</then>
+		<else>
   <property name="jboss.j2ee.root" value="${project.thirdparty}/jboss-j2ee"/>
+		</else>
+	</if>
   <property name="jboss.j2ee.lib" value="${jboss.j2ee.root}/lib"/>
   <path id="jboss.j2ee.classpath">
     <pathelement path="${jboss.j2ee.lib}/jboss-j2ee.jar"/>
   </path>
 
   <!-- JBoss System -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="jboss.system.root" value="${jboss.home}"/>
+		</then>
+		<else>
   <property name="jboss.system.root" value="${project.thirdparty}/jboss-system"/>
+		</else>
+	</if>
   <property name="jboss.system.lib" value="${jboss.system.root}/lib"/>
   <path id="jboss.system.classpath">
     <pathelement path="${jboss.system.lib}/jboss-common.jar"/>
@@ -158,7 +273,15 @@
   </path>
 
   <!-- JBoss SX -->
+	<if>
+		<istrue value="${jboss.present}"/>
+		<then>
+  			<property name="jboss.sx.root" value="${jboss.home}/server/all"/>
+		</then>
+		<else>
   <property name="jboss.sx.root" value="${project.thirdparty}/jboss-sx"/>
+		</else>
+	</if>
   <property name="jboss.sx.lib" value="${jboss.sx.root}/lib"/>
   <path id="jboss.sx.classpath">
     <pathelement path="${jboss.sx.lib}/jbosssx.jar"/>