svn commit: r154194 - in incubator/beehive/trunk/controls/test/tools/mantis: mantis.xml src/org/apache/beehive/test/tools/mantis/MantisTask.java

[js...@apache.org]

Author: jsong
Date: Thu Feb 17 13:32:42 2005
New Revision: 154194

URL: http://svn.apache.org/viewcvs?view=rev&rev=154194
Log:
Contributed by Jamie Zyskowski: mantis fixes for BEEHIVE-122 and BEEHIVE-322

Modified:
    incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
    incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java

Modified: incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml?view=diff&r1=154193&r2=154194
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml (original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml Thu Feb 17 13:32:42 2005
@@ -8,7 +8,7 @@
 		</echo>
 	</target>
 
-        <import file="../../beehive-imports.xml"/>
+        <import file="../../../../beehive-imports.xml"/>
 	<property file="${beehive.home}/controls/test/common/path.properties"/>
 
 	<!-- mantis properties -->	
@@ -59,6 +59,7 @@
 						logdir="${mantis.log.dir}"
 						config="${config}"
 						aptcommand="${os.JAVA_HOME}/bin/apt"
+						processorArgs="arg1=arg1val,arg2=arg2val"
 		/>
 	</target>
 

Modified: incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java?view=diff&r1=154193&r2=154194
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java (original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/test/tools/mantis/MantisTask.java Thu Feb 17 13:32:42 2005
@@ -4,6 +4,7 @@
 import java.io.FileWriter;
 import java.io.InputStream;
 import java.io.IOException;
+import java.util.StringTokenizer;
 
 import org.apache.tools.ant.taskdefs.MatchingTask;
 import org.apache.tools.ant.BuildException;
@@ -25,6 +26,7 @@
   // optional attributes
   private boolean _compile = false;
   private String _processor = null;
+  private String _processorArgs = null;
   private int _timeout = 5000;
   // use _srcgen if not provided
   private String _logdir = null;
@@ -70,6 +72,11 @@
   {
     _processor = p_processor;
   }
+  
+  public void setProcessorArgs(String p_procargs)
+  {
+  	_processorArgs = p_procargs;
+  }
 
   public void setLogdir(String p_logdir)
   {
@@ -115,7 +122,7 @@
     cmd.append(_aptcommand+" ");
     if(!_compile)
       cmd.append(" -nocompile ");
-    cmd.append("-classpath "+_classpath+" ");
+    cmd.append("-classpath \""+_classpath+"\" ");
     cmd.append("-s "+_srcgen+" ");
     if(null != _bingen)
       cmd.append("-d "+_bingen+" ");
@@ -124,6 +131,15 @@
     cmd.append("-Aconfig="+_config+" ");
     if(null != _processor)
       cmd.append("-Aprocessor="+_processor+" ");
+    
+    if(null != _processorArgs)
+    {
+    	StringTokenizer st = new StringTokenizer(_processorArgs,",");
+    	while(st.hasMoreTokens())
+    	{
+    		cmd.append("-A"+st.nextToken()+" ");
+    	}
+    }
     cmd.append("@"+filename+" ");
 
     System.out.println("running command:\n"+cmd.toString());