[Jboss-cvs] JBossAS SVN: r55501 - trunk/build

[jboss-cvs-commits at lists.jboss.org]

Author: ruel.loehr at jboss.com
Date: 2006-08-10 16:43:16 -0400 (Thu, 10 Aug 2006)
New Revision: 55501

Modified:
   trunk/build/build.xml
Log:
fix build, ejb3 must now be built prior to tomcat

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-08-10 19:44:30 UTC (rev 55500)
+++ trunk/build/build.xml	2006-08-10 20:43:16 UTC (rev 55501)
@@ -77,18 +77,7 @@
     <!-- The group to use by default -->
     <property name="groups" value="default"/>
 
-    <condition property="buildejb3" value="ejb3x,ejb3,">
-       <isset property="HAVE_JDK_1.5"/>
-    </condition>
 
-     <condition property="buildejb3" value="  ">
-        <not>
-           <isset property="HAVE_JDK_1.5"/>
-        </not>
-     </condition>
-
-     <echo message="build ejb3: ${buildejb3}"/>
-
     <!-- Sets up the module configuration. -->
     <moduleconfig property="modules" selected="${groups}">
 
@@ -156,10 +145,11 @@
                           iiop,
                           management,
                           aspects,
+			  ejb3x,
+			  ejb3,
                           tomcat,
                           hibernate-int,
                           console,
-                          ${buildejb3}
                           webservice
                           "/>
       </group>