You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by fe...@apache.org on 2005/10/18 22:45:09 UTC

svn commit: r326229 - in /jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven: plugin.jelly src/plugin-test/testCactusSysProperties/maven.xml

Author: felipeal
Date: Tue Oct 18 13:44:45 2005
New Revision: 326229

URL: http://svn.apache.org/viewcvs?rev=326229&view=rev
Log:
CACTUS-128: cactus:test-ear now also uses cactus.sysproperties

Modified:
    jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/plugin.jelly
    jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml

Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/plugin.jelly
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/plugin.jelly?rev=326229&r1=326228&r2=326229&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/plugin.jelly (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/plugin.jelly Tue Oct 18 13:44:45 2005
@@ -1089,6 +1089,13 @@
         errorproperty="cactustests.error" failureproperty="cactustests.failure"
         printsummary="${maven.cactus.printsummary}">
 
+      <!-- Pass any user-defined system properties -->
+      <util:tokenize var="listOfProperties" delim=" ">${cactus.sysproperties}</util:tokenize>
+      <j:forEach var="someProperty" items="${listOfProperties}">
+        <ant:sysproperty key="${someProperty}" 
+            value="${context.getVariable(someProperty)}"/>
+      </j:forEach>     
+
       <!-- Configure the cactus task for logging -->
       <j:if test="${context.getVariable('cactus.logging.config.client') != null}">
         <cactusproperty server="false"

Modified: jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml?rev=326229&r1=326228&r2=326229&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml (original)
+++ jakarta/cactus/branches/CACTUS_17_BRANCH/integration/maven/src/plugin-test/testCactusSysProperties/maven.xml Tue Oct 18 13:44:45 2005
@@ -1,6 +1,6 @@
 <!-- 
 /*
- * Copyright 2004 The Apache Software Foundation.
+ * Copyright 2004-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
   <goal name="testPlugin" prereqs="clean">
     <echo>NOTE: this test is only effective if you set at least one container to run cactus tests</echo>
     <echo>Set maven.compile.target as ${maven.compile.target}</echo>
+    <attainGoal name="cactus:test-ear"/>
     <attainGoal name="cactus:test-war"/>
     <attainGoal name="cactus:single"/>
     <attainGoal name="cactus:match"/>



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