[Jboss-cvs] JBossAS SVN: r56546 - in trunk: ejb3 varia

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

Author: ryan.campbell at jboss.com
Date: 2006-09-04 09:45:36 -0400 (Mon, 04 Sep 2006)
New Revision: 56546

Modified:
   trunk/ejb3/build.xml
   trunk/varia/build.xml
Log:
merge from JEE5_TCK branch

Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2006-09-04 13:38:14 UTC (rev 56545)
+++ trunk/ejb3/build.xml	2006-09-04 13:45:36 UTC (rev 56546)
@@ -451,7 +451,7 @@
          <zipfileset src="${jboss.ejb3x.lib}/jboss-ejb3x.jar"/>
          <zipfileset src="${jboss.aop.lib}/jboss-aop-jdk50.jar"/>
          <zipfileset src="${jboss.varia.lib}/hsqldb-plugin.jar" />
-         <zipfileset src="${jboss.messaging.lib}/jbossmq.jar" />
+         <zipfileset src="${jboss.messaging.lib}/jboss-messaging.jar" />
          <zipfileset src="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar" />
          <zipfileset src="${jboss.transaction.lib}/jboss-transaction.jar" />
          <zipfileset src="${jboss.naming.lib}/jnpserver.jar" />

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2006-09-04 13:38:14 UTC (rev 56545)
+++ trunk/varia/build.xml	2006-09-04 13:45:36 UTC (rev 56546)
@@ -112,7 +112,13 @@
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.security.classpath"/>
       <path refid="jboss.transaction.classpath"/>
-      <path refid="jboss.messaging.classpath"/>
+
+      <!-- There is a name conflict between Messaging and JBossMQ (JBossMQ directory
+           should have been named jbossmq, not messaging), and since no other component
+           but this uses JBossMQ, I am hardcoding the path here.
+        -->
+      <!-- <path refid="jboss.messaging.classpath"/> -->
+      <pathelement location="../messaging/output/lib/jbossmq.jar"/>
     </path>
 
     <!-- ===== -->
@@ -203,6 +209,7 @@
       <classpath refid="javac.classpath"/>
       <exclude name="org/jboss/tm/plugins/tyrex/*.java"/>
       <exclude name="org/jboss/jdo/castor/*.java"/>
+      <!--<exclude name="org/jboss/mq/il/http/servlet/HTTPServerILServlet.java"/> -->
     </javac>
   </target>