[jboss-cvs] JBossAS SVN: r79067 - in trunk/testsuite: imports/sections and 1 other directories.

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

Author: istudens at redhat.com
Date: 2008-10-03 07:48:41 -0400 (Fri, 03 Oct 2008)
New Revision: 79067

Modified:
   trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
   trunk/testsuite/imports/sections/deployers.xml
   trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml
Log:
little issues about bad committed version

Modified: trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml
===================================================================
--- trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml	2008-10-03 11:13:48 UTC (rev 79066)
+++ trunk/testsuite/imports/config/tests-bootstrap-dependencies.xml	2008-10-03 11:48:41 UTC (rev 79067)
@@ -24,46 +24,56 @@
    <!-- JBAS-5349 -->
    <target name="tests-bootstrap-dependencies" 
    	description="Tests bootstrap dependencies of the JBossMC.">
-   	<!-- EJB3 Session -->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
+         <param name="jboss-junit-configuration" value="EJB2Message"/>
+         <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-messagebean.jar"/>
+      </antcall>
+   	<!-- EJB3 Session - ->
+      <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB3Session"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-sessionbean.jar"/>
    	</antcall>
-      <!-- EJB3 Entity -->
+      <!- - EJB3 Entity - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB3Entity"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-entitybean.jar"/>
       </antcall>
-      <!-- EJB3 Message -->
+      <!- - EJB3 Message - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB3Message"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb3-messagebean.jar"/>
       </antcall>
-      <!-- EJB2 Session -->
+      <!- - EJB2 Session - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB2Session"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-sessionbean.jar"/>
       </antcall>
-      <!-- EJB2 CMP Entity -->
+      <!- - EJB2 CMP Entity - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB2EntityCMP"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-entitycmpbean.jar"/>
       </antcall>
-      <!-- EJB2 Message -->
+      <!- - EJB2 Message - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="EJB2Message"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-ejb2-messagebean.jar"/>
       </antcall>
-      <!-- Web WAR -->
+      <!- - Web WAR - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="WAR"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-web.war"/>
       </antcall>
-      <!-- datasource -->
+      <!- - datasource - ->
       <antcall target="generalmodule-bootstrap-dependencies-tests">
          <param name="jboss-junit-configuration" value="datasource"/>
          <param name="bootstrap.testmodule.name" value="bootstrapdependencies-hsqldb-ds.xml"/>
       </antcall>
+      <!- - RAR - ->
+      <antcall target="generalmodule-bootstrap-dependencies-tests">
+         <param name="jboss-junit-configuration" value="RAR"/>
+         <param name="bootstrap.testmodule.name" value="bootstrapdependencies-hsqldb-ds.xml"/>
+      </antcall>
+   	-->
     </target>
 	
    <!-- General module's test -->

Modified: trunk/testsuite/imports/sections/deployers.xml
===================================================================
--- trunk/testsuite/imports/sections/deployers.xml	2008-10-03 11:13:48 UTC (rev 79066)
+++ trunk/testsuite/imports/sections/deployers.xml	2008-10-03 11:48:41 UTC (rev 79067)
@@ -154,12 +154,12 @@
             <include name="**/*"/>
          </fileset>
         <fileset dir="${build.classes}">
-           <include name="org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.java"/>
+           <include name="org/jboss/test/deployers/jbas5349/ejb3/SimpleEntity.class"/>
         </fileset>
       </jar>
       <jar destfile="${build.lib}/bootstrapdependencies-ejb3-messagebean.jar">
         <fileset dir="${build.classes}">
-           <include name="org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.java"/>
+           <include name="org/jboss/test/deployers/jbas5349/ejb3/DummyMessageBean.class"/>
         </fileset>
       </jar>
       <jar destfile="${build.lib}/bootstrapdependencies-ejb2-sessionbean.jar">
@@ -180,8 +180,11 @@
          </fileset>
       </jar>
       <jar destfile="${build.lib}/bootstrapdependencies-ejb2-messagebean.jar">
+        <fileset dir="${build.resources}/deployers/jbas5349/ejb2/mdb">
+           <include name="**/*"/>
+        </fileset>
         <fileset dir="${build.classes}">
-           <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.java"/>
+           <include name="org/jboss/test/deployers/jbas5349/ejb2/DummyMessageBean.class"/>
         </fileset>
       </jar>
       <jar destfile="${build.lib}/bootstrapdependencies-web.war">
@@ -189,7 +192,7 @@
             <include name="**/*"/>
          </fileset>
         <fileset dir="${build.classes}">
-           <include name="org/jboss/test/deployers/jbas5349/servlet/DummyServlet.java"/>
+           <include name="org/jboss/test/deployers/jbas5349/servlet/DummyServlet.class"/>
         </fileset>
       </jar>
 

Modified: trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml	2008-10-03 11:13:48 UTC (rev 79066)
+++ trunk/testsuite/src/resources/deployers/jbas5349/ejb2/mdb/META-INF/ejb-jar.xml	2008-10-03 11:48:41 UTC (rev 79067)
@@ -6,7 +6,7 @@
    <enterprise-beans>
       <message-driven >
          <ejb-name>DummyMessageBean</ejb-name>
-         <ejb-class>iorg.jboss.test.deployers.jbas5349.ejb2.DummyMessageBean</ejb-class>
+         <ejb-class>org.jboss.test.deployers.jbas5349.ejb2.DummyMessageBean</ejb-class>
          <messaging-type>javax.jms.MessageListener</messaging-type>
          <transaction-type>Container</transaction-type>
          <message-destination-type>javax.jms.Queue</message-destination-type>