Return-Path: 
 <dev-return-13031-apmail-maven-dev-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-dev-archive@maven.apache.org
Received: (qmail 7188 invoked by uid 500); 7 Jun 2003 15:42:21 -0000
Mailing-List: contact dev-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@maven.apache.org>
List-Subscribe: <mailto:dev-subscribe@maven.apache.org>
List-Help: <mailto:dev-help@maven.apache.org>
List-Post: <mailto:dev@maven.apache.org>
List-Id: "Maven Developers List" <dev.maven.apache.org>
Reply-To: "Maven Developers List" <dev@maven.apache.org>
Delivered-To: mailing list dev@maven.apache.org
Received: (qmail 7174 invoked by uid 500); 7 Jun 2003 15:42:21 -0000
Received: (qmail 7163 invoked from network); 7 Jun 2003 15:42:21 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 7 Jun 2003 15:42:21 -0000
Received: (qmail 69622 invoked by uid 1262); 7 Jun 2003 15:42:20 -0000
Date: 7 Jun 2003 15:42:20 -0000
Message-ID: <20030607154220.69621.qmail@icarus.apache.org>
From: vmassol@apache.org
To: maven-cvs@apache.org
Subject: cvs commit: maven/src/plugins-build/cactus plugin.jelly
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

vmassol     2003/06/07 08:42:20

  Modified:    src/plugins-build/cactus plugin.jelly
  Log:
  Make it work with Cactus tests using HttpUnit
  
  Revision  Changes    Path
  1.19      +25 -17    maven/src/plugins-build/cactus/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/cactus/plugin.jelly,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- plugin.jelly	5 Jun 2003 05:35:33 -0000	1.18
  +++ plugin.jelly	7 Jun 2003 15:42:20 -0000	1.19
  @@ -30,12 +30,12 @@
       <ant:path id="cactus.classpath">
         <pathelement location="${plugin.getDependencyPath('cactus:cactus-ant')}"/>
         <pathelement location="${plugin.getDependencyPath('cactus:cactus')}"/>
  -      <pathelement location="${plugin.getDependencyPath('commons-logging')}"/>
  -      <pathelement location="${plugin.getDependencyPath('junit')}"/>
  -      <pathelement location="${plugin.getDependencyPath('commons-httpclient')}"/>
  +      <pathelement location="${plugin.getDependencyPath('commons-logging:commons-logging')}"/>
  +      <pathelement location="${plugin.getDependencyPath('junit:junit')}"/>
  +      <pathelement location="${plugin.getDependencyPath('commons-httpclient:commons-httpclient')}"/>
         <pathelement location="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
  -      <pathelement location="${plugin.getDependencyPath('httpunit')}"/>
  -      <pathelement location="${plugin.getDependencyPath('nekohtml')}"/>
  +      <pathelement location="${plugin.getDependencyPath('httpunit:httpunit')}"/>
  +      <pathelement location="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
         <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
         <pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
       </ant:path>
  @@ -137,18 +137,26 @@
     
         <ant:classes dir="${cactus.target.classes.dir}"/>
   
  -        <!-- Orion fails on a servlet filter that is not mapped to an actual
  -             resource, to trick it -->
  -        <filterredirector mapping="/test/filterRedirector.jsp"/>
  -
  -        <!-- Files needed for JBoss -->
  -        <ant:classes dir="${plugin.resources}/jboss3x">
  -          <ant:include name="*.properties" if="cactus.home.jboss3x"/>
  -        </ant:classes>
  -        <ant:webinf dir="${plugin.resources}/jboss3x">
  -          <ant:include name="jboss-web.xml" if="cactus.home.jboss3x"/>
  -        </ant:webinf>
  -
  +      <!-- Orion fails on a servlet filter that is not mapped to an actual
  +           resource, to trick it -->
  +      <filterredirector mapping="/test/filterRedirector.jsp"/>
  +
  +      <!-- Files needed for JBoss -->
  +      <ant:classes dir="${plugin.resources}/jboss3x">
  +        <ant:include name="*.properties" if="cactus.home.jboss3x"/>
  +      </ant:classes>
  +      <ant:webinf dir="${plugin.resources}/jboss3x">
  +        <ant:include name="jboss-web.xml" if="cactus.home.jboss3x"/>
  +      </ant:webinf>
  +
  +      <!-- Add all cactus related jars to the WEB-INF/lib dir. By default
  +      	   the CactifyWarTask only adds the pure Cactus jars but not
  +      	   related jars such as HttpUnit jars -->
  +      <lib file="${plugin.getDependencyPath('httpunit:httpunit')}"/>
  +      <lib file="${plugin.getDependencyPath('nekohtml:nekohtml')}"/>
  +      <lib file="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
  +      <lib file="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/>
  +      	   
       </cactifywar>
   
     </goal>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org