diff -Nbaur --exclude-from=/tmp/portal.excludes jboss-portal-2.0.orig/tools/etc/buildfragments/buildmagic.ent jboss-portal-2.0/tools/etc/buildfragments/buildmagic.ent
--- jboss-portal-2.0.orig/tools/etc/buildfragments/buildmagic.ent	Sat Jan 15 18:33:02 2005
+++ jboss-portal-2.0/tools/etc/buildfragments/buildmagic.ent	Fri Feb  4 07:22:53 2005
@@ -1,48 +1,56 @@
 <!-- $Id: buildmagic.ent,v 1.3 2005/01/15 17:33:02 vietj Exp $ -->
 
+<!-- used to check for JBOSS_HOME and ANT_HOME -->
+<property environment="env"/>
+
+<!-- Setup the project environment. Required very early -->
+<dirname property="project.root" file="${basedir}"/>
+<property name="project.build" value="${project.root}/build"/>
+<property name="project.tools" value="${project.root}/tools"/>
+<property name="project.thirdparty" value="${project.root}/thirdparty"/>
+
+<!-- we assume ant 1.6.2, properties above must be set, before we can do
+     this (unfortunaetly ant evals ourside taskdefs before properties) -->
+<target name="ant-contribs.load" unless="ant-contribs.loaded">
+	<taskdef resource="net/sf/antcontrib/antlib.xml">
+		<classpath>
+			<pathelement location="${project.thirdparty}/ant-contrib/lib/ant-contrib-1.0b1.jar"/>    
+		</classpath>
+	</taskdef>
+	<property name="ant-contribs.loaded" value="true"/>
+</target>
+
 <!-- ================================================================== -->
 <!-- Initialization                                                     -->
 <!-- ================================================================== -->
 
 <!-- Initialize the build system. -->
-<target name="_buildmagic:init" unless="init.disable">
-
-  <!-- Make sure we have the right version of Ant -->
-  <property name="buildmagic.ant.baseversion" value="1.5"/>
-
-  <!--
-     | Add new conditions for other supported Ant versions when they
-     | become avaialble.
-   -->
-
-  <condition property="buildmagic.ant.compatible">
-    <and>
-      <contains string="${ant.version}" 
-	        substring="Ant version ${buildmagic.ant.baseversion}"/>
-    </and>
-  </condition>
-
-  <fail unless="buildmagic.ant.compatible">
-
-  Unsupported Ant version:
+<target name="_buildmagic:init" unless="init.disable" depends="ant-contribs.load">
+	<if>
+		<available file="${env.JBOSS_HOME}/server/all/lib/jbosssx.jar"/>
+		<then>
+			<property name="jboss.present" value="true"/>
+			<property name="jboss.home" value="${env.JBOSS_HOME}"/>
+		</then>
+	</if>
 
-    ${ant.version}
+	<available property="junit.present" classname="junit.framework.Test"/>
+	<!-- hmmm - cactus taskdef requires junit.jar beeing available,
+		when it is defined - so ... -->
+    <fail unless="junit.present">
+Junit is required. Please the following file to your CLASSPATH :
 
-  Please install a version which is compatible with Ant ${buildmagic.ant.baseversion}.
+    ${basedir}/../tools/lib/junit.jar
 
-  </fail>
+</fail>
 
   <!-- JDK Detection -->
   <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
   <available classname="java.lang.ThreadLocal" property="HAVE_JDK_1.2"/>
   <available classname="java.lang.StrictMath" property="HAVE_JDK_1.3"/>
   <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
+  <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
 
-  <!-- Setup the project environment. -->
-  <dirname property="project.root" file="${basedir}"/>
-  <property name="project.build" value="${project.root}/build"/>
-  <property name="project.tools" value="${project.root}/tools"/>
-  <property name="project.thirdparty" value="${project.root}/thirdparty"/>
 
   <!-- Setup the module environment. -->
   <property name="module.root" value="${basedir}"/>
@@ -50,10 +58,6 @@
   <property name="module.output" value="${module.root}/output"/>
   <property name="module.tools" value="${module.root}/tools"/>
   <property name="module.thirdparty" value="${module.root}/thirdparty"/>
-
-  <!-- Setup the JBoss environment -->
-  <property environment="env"/>
-  <property name="jboss.home" value="${env.JBOSS_HOME}"/>
 
   <!-- Load Buildmagic extention tasks. -->
   <property name="buildmagic.local.classpath" value="."/>