[jboss-cvs] jbosstest ...

Anil Saldhana anil.saldhana at jboss.com
Thu Jul 20 13:22:12 EDT 2006


  User: asaldhana
  Date: 06/07/20 13:22:12

  Modified:    jbosstest  build.xml
  Log:
  JBAS-2621: Update tests-scout-jaxr target and remove the old jaxr target
  
  Revision  Changes    Path
  1.587     +68 -133   jbosstest/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.586
  retrieving revision 1.587
  diff -u -b -r1.586 -r1.587
  --- build.xml	19 Jul 2006 21:28:44 -0000	1.586
  +++ build.xml	20 Jul 2006 17:22:12 -0000	1.587
  @@ -10,7 +10,7 @@
   <!--  See terms of license at http://www.gnu.org.                 -->
   <!-- ============================================================ -->
   
  -<!-- $Id: build.xml,v 1.586 2006/07/19 21:28:44 ssilvert Exp $ -->
  +<!-- $Id: build.xml,v 1.587 2006/07/20 17:22:12 asaldhana Exp $ -->
   
   <project default="main" name="JBoss/Testsuite"
            xmlns:server="http://jboss.org/ns/test/ant/server">
  @@ -86,6 +86,7 @@
         <path refid="apache.codec.classpath"/>
         <path refid="apache.log4j.classpath"/>
         <path refid="apache.jaxme.classpath"/>
  +      <path refid="apache.scout.classpath"/>
         <path refid="apache.tomcat.classpath"/>
         <path refid="apache.xerces.classpath"/>
         <path refid="apache.xmlsec.classpath"/>
  @@ -97,6 +98,7 @@
         <path refid="junit.junit.classpath"/>
         <path refid="junitejb.junitejb.classpath"/>
         <path refid="javassist.classpath"/>
  +      <path refid="juddi.juddi.classpath"/>
         <path refid="objectweb.joramtests.classpath"/>
         <path refid="opensaml.opensaml.classpath"/>
         <path refid="oswego.concurrent.classpath"/>
  @@ -2866,8 +2868,12 @@
        <server:stop name="webservice-ssl"/>
     </target>
   
  +   <!--    
  +    | Standard jaxr tests that should run successfully against a
  +    | JBoss server distribution build that contains jaxr.
  +	-->
      <!-- Test for JAXR under the Web Services Umbrella -->
  -    <target name="tests-scout-jaxr">
  +	<target name="tests-scout-jaxr" >
         <mkdir dir="${build.reports}"/>
         <mkdir dir="${build.testlog}"/>
         <junit dir="${module.output}"
  @@ -2879,7 +2885,17 @@
            jvm="${junit.jvm}"
            failureProperty="tests.failure">
   
  +	 <!-- JPDA Debugging begin-->
  +	<!--
  +	      <jvmarg value="-Xdebug"/>
  +	      <jvmarg value="-Xnoagent"/>
  +	      <jvmarg value="-Djava.compiler=NONE"/>
  +	      <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8686"/>
  +	-->
  +	      <!-- End JPDA Debuuging begin-->
  +
            <jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/>
  +	      <sysproperty key="jbosstest.server.host" value="${node0}"/>
            <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
            <sysproperty key="build.testlog" value="${build.testlog}"/>
            <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  @@ -2889,31 +2905,19 @@
                 value="http://${node0}:8080/juddi/inquiry"/>
            <sysproperty key="jaxr.publish.url"
                 value="http://${node0}:8080/juddi/publish"/>
  +	      <sysproperty key="juddi.proxy.transportClass"
  +	        value="org.jboss.jaxr.juddi.transport.SaajTransport"/>
  +	       <sysproperty key="host.name" value="${node0}"/>
  +	       <sysproperty key="jndi.bind.name" value="JAXR"/>
  +	       <sysproperty key="jaxr.debug" value="true"/>
            <!-- Pass along any jbosstest.* system properties -->
            <syspropertyset>
               <propertyref prefix="jbosstest."/>
            </syspropertyset>
  -         <!-- Classpath to build and run the Jaxr tests. Jaxr is quite brittle
  -        with heavy reliance on xml security, castor etc.  Any changes to the
  -        dependencies/classpath drives the tester crazy. Please retain this
  -        until Jaxr has a permanent solution with juddi/Scout.-->
  +
            <classpath>
               <pathelement location="${build.classes}"/>
  -
  -             <path refid="apache.xerces.classpath"/>
  -             <path refid="dom4j.dom4j.classpath"/>
  -             <path refid="sun.javamail.classpath"/>
  -             <path refid="sun.jaf.classpath"/>
  -             <path refid="apache.commons.classpath"/>
  -             <path refid="juddi.juddi.classpath"/>
  -             <path refid="apache.scout.classpath"/>
  -
  -             <fileset dir="${jboss.dist}/client">
  -                <include name="jbossall-client.jar"/>
  -                <include name="jboss-j2ee.jar"/>
  -                <include name="axis-ws4ee.jar"/>
  -                <include name="jboss-juddiaxis.jar"/>
  -             </fileset>
  +	        <path refid="tests.classpath"/>
            </classpath>
   
            <formatter type="xml" usefile="${junit.formatter.usefile}"/>
  @@ -2988,75 +2992,6 @@
         <delete file="${jboss.dist}/bin/pluggable-instrumentor.jar"/>
      </target>
   
  -
  -
  -
  -
  -    <!-- Test for JAXR under the Web Services Umbrella -->
  -    <target name="tests-jaxr">
  -      <mkdir dir="${build.reports}"/>
  -      <mkdir dir="${build.testlog}"/>
  -      <junit dir="${module.output}"
  -         printsummary="${junit.printsummary}"
  -         haltonerror="${junit.haltonerror}"
  -         haltonfailure="${junit.haltonfailure}"
  -         fork="${junit.fork}"
  -         timeout="${junit.timeout}"
  -         jvm="${junit.jvm}"
  -         failureProperty="tests.failure">
  -
  -         <jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/>
  -         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
  -         <sysproperty key="build.testlog" value="${build.testlog}"/>
  -         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
  -         <sysproperty key="javax.xml.registry.ConnectionFactoryClass"
  -              value="com.sun.xml.registry.ebxml.ConnectionFactoryImpl"/>
  -         <sysproperty key="jaxr.queryurl"
  -              value="http://${node0}:8080/ebxmlrr/registry/soap"/>
  -         <sysproperty key="jaxr.publishurl"
  -              value="http://${node0}:8080/ebxmlrr/registry/soap"/>
  -         <!-- Pass along any jbosstest.* system properties -->
  -         <syspropertyset>
  -            <propertyref prefix="jbosstest."/>
  -         </syspropertyset>
  -         <!-- Classpath to build and run the Jaxr tests. Jaxr is quite brittle
  -        with heavy reliance on xml security, castor etc.  Any changes to the
  -        dependencies/classpath drives the tester crazy. Please retain this
  -        until Jaxr has a permanent solution with juddi/Scout.-->
  -         <classpath>
  -            <pathelement location="${build.classes}"/>
  -
  -             <path refid="apache.xerces.classpath"/>
  -             <path refid="apache.xmlsec.classpath"/>
  -             <path refid="dom4j.dom4j.classpath"/>
  -             <path refid="exolab.castor.jaxr.classpath"/>
  -             <path refid="ebxmlrr.ebxmlrr.classpath"/>
  -             <path refid="sun.javamail.classpath"/>
  -             <path refid="sun.jaf.classpath"/>
  -             <path refid="apache.commons.classpath"/>
  -
  -             <fileset dir="${jboss.dist}/client">
  -                <include name="jbossall-client.jar"/>
  -                <include name="jboss-j2ee.jar"/>
  -                <include name="axis-ws4ee.jar"/>
  -                <include name="jboss-ws4ee-client.jar"/>
  -             </fileset>
  -         </classpath>
  -
  -         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
  -
  -         <batchtest todir="${build.reports}"
  -            haltonerror="${junit.batchtest.haltonerror}"
  -            haltonfailure="${junit.batchtest.haltonfailure}"
  -            fork="${junit.batchtest.fork}">
  -
  -            <fileset dir="${build.classes}">
  -               <patternset refid="jaxr.includes"/>
  -            </fileset>
  -         </batchtest>
  -      </junit>
  -   </target>
  -
      <!-- Test for ws-bpel integration -->
      <target name="tests-bpel">
         <!-- define tasks used in this target -->
  
  
  



More information about the jboss-cvs-commits mailing list