You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/12 17:23:08 UTC

svn commit: r232310 [85/92] - in /beehive/trunk/controls/test: common/ infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/ infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/ perf/ctlsrc/org/apache/beehive/controls/per...

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ArgElement.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ArgElement.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ArgElement.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ArgElement.java Fri Aug 12 08:12:28 2005
@@ -1,34 +1,34 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-public class ArgElement
-{
-  private String name = null;
-  private String value = null;
-
-  public void setValue(String in)
-  {
-    value = in;
-  }
-
-  public String getValue()
-  {
-    return value;
-  }
-
-  public void setName(String in)
-  {
-    name = in;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public String toString()
-  {
-    return name + "=" + value + "\n";
-  }
-
-}
-
+package org.apache.beehive.test.tools.tch.util.ant;
+
+public class ArgElement
+{
+  private String name = null;
+  private String value = null;
+
+  public void setValue(String in)
+  {
+    value = in;
+  }
+
+  public String getValue()
+  {
+    return value;
+  }
+
+  public void setName(String in)
+  {
+    name = in;
+  }
+
+  public String getName()
+  {
+    return name;
+  }
+
+  public String toString()
+  {
+    return name + "=" + value + "\n";
+  }
+
+}
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ArgElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/DetermineHostname.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/DetermineHostname.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/DetermineHostname.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/DetermineHostname.java Fri Aug 12 08:12:28 2005
@@ -1,74 +1,74 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class DetermineHostname extends Task
-{
-  private static InetAddress host = null;
-  
-  private boolean fullyQualified = false;
-  private String destinationPropName = null;
-  private boolean toLowerCase = false;
-
-  public void setPropertyName(String in)
-  {
-    destinationPropName = in;
-  }
-  
-  public void setToLowerCase(boolean in)
-  {
-  	toLowerCase = in;
-  }
-  
-  public void setFullyQualified(boolean in)
-  {
-  	fullyQualified = in;
-  }
-
-  public void execute()
-  {
-    if (destinationPropName == null)
-      throw new BuildException("propertyname must be set");
-    
-    String hostname = null;
-    
-    if (fullyQualified)
-      hostname = getHost().getCanonicalHostName();
-    else
-    {
-      hostname = getHost().getHostName();
-      // this still returns the fully qualified host name on linux
-      // so do lame truncation
-      int dotIndex = hostname.indexOf(".");
-      if(dotIndex > -1)
-        hostname = hostname.substring(0, dotIndex);
-    }
-    
-    if (toLowerCase)
-      hostname = hostname.toLowerCase();
-      
-    getProject().setProperty(destinationPropName, hostname);
-  }
-
-  public InetAddress getHost()
-  {
-    synchronized (getClass())
-    {
-      if (host == null)
-        try
-        {
-          host = InetAddress.getLocalHost();
-        }
-        catch (UnknownHostException ex)
-        {
-          throw new BuildException(ex);
-        }
-    }
-    return host;
-  }
-
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+public class DetermineHostname extends Task
+{
+  private static InetAddress host = null;
+  
+  private boolean fullyQualified = false;
+  private String destinationPropName = null;
+  private boolean toLowerCase = false;
+
+  public void setPropertyName(String in)
+  {
+    destinationPropName = in;
+  }
+  
+  public void setToLowerCase(boolean in)
+  {
+  	toLowerCase = in;
+  }
+  
+  public void setFullyQualified(boolean in)
+  {
+  	fullyQualified = in;
+  }
+
+  public void execute()
+  {
+    if (destinationPropName == null)
+      throw new BuildException("propertyname must be set");
+    
+    String hostname = null;
+    
+    if (fullyQualified)
+      hostname = getHost().getCanonicalHostName();
+    else
+    {
+      hostname = getHost().getHostName();
+      // this still returns the fully qualified host name on linux
+      // so do lame truncation
+      int dotIndex = hostname.indexOf(".");
+      if(dotIndex > -1)
+        hostname = hostname.substring(0, dotIndex);
+    }
+    
+    if (toLowerCase)
+      hostname = hostname.toLowerCase();
+      
+    getProject().setProperty(destinationPropName, hostname);
+  }
+
+  public InetAddress getHost()
+  {
+    synchronized (getClass())
+    {
+      if (host == null)
+        try
+        {
+          host = InetAddress.getLocalHost();
+        }
+        catch (UnknownHostException ex)
+        {
+          throw new BuildException(ex);
+        }
+    }
+    return host;
+  }
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/DetermineHostname.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FailureCheckTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FailureCheckTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FailureCheckTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FailureCheckTask.java Fri Aug 12 08:12:28 2005
@@ -1,108 +1,108 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.io.File;
-
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.beehive.test.tools.tch.util.gtlf.GTLFConstants;
-import org.apache.beehive.test.tools.tch.util.gtlf.GTLFEntityResolver;
-
-/**
- * Given a GTLF file, throws a BuildException is the GTLF is malformed,
- * or if there have been any FAILURE/SCRATCH/SKIP/ABORT results in the 
- * run.
- * 
- * Created on Jan 8, 2004
- */
-public class FailureCheckTask extends Task
-{
-  private File gtlfFile = null;
-
-  public void setGTLFFile(File f)
-  {
-    gtlfFile = f;
-  }
-
-  public void execute()
-  {
-    if (gtlfFile == null)
-      throw new BuildException("${gtlffile} must be set");
-    if (!gtlfFile.exists())
-      throw new BuildException(
-        "Cannot find gtlffile: " + gtlfFile.getAbsolutePath());
-
-    parseGTLF();
-
-    log(
-      "Did not find any problems with this run, not failing the build",
-      Project.MSG_VERBOSE);
-  }
-
-  private void parseGTLF()
-  {
-    GTLFParser parser = null;
-    try
-    {
-      SAXParserFactory factory = SAXParserFactory.newInstance();
-      SAXParser saxParser = factory.newSAXParser();
-      parser = new GTLFParser();
-      saxParser.parse(gtlfFile, parser);
-    }
-    catch (Exception ex)
-    {
-      throw new BuildException(ex);
-    }
-    if (parser.encounteredFailure())
-      throw new BuildException("Found at least one bad test");
-  }
-
-  private class GTLFParser extends DefaultHandler
-  {
-    private boolean encounteredFailure = false;
-
-    public InputSource resolveEntity(String publicId, String systemId)
-      throws SAXException
-    {
-      return new GTLFEntityResolver().resolveEntity(publicId, systemId);
-    }
-
-    public void startElement(
-      String namespaceURI,
-      String localName,
-      String qName,
-      Attributes attr)
-      throws SAXException
-    {
-      if (GTLFConstants.TEST_RESULT_ELEMENT.equals(qName))
-      {
-        if (isBadResult(attr
-          .getValue(GTLFConstants.PARAM_RESULT_RESULT)
-          .trim()))
-          encounteredFailure = true;
-      }
-    }
-
-    public boolean encounteredFailure()
-    {
-      return encounteredFailure;
-    }
-
-    public boolean isBadResult(String result)
-    {
-      return (
-        result.equals(GTLFConstants.FAILURE_VALUE)
-          || result.equals(GTLFConstants.SKIP_VALUE)
-          || result.equals(GTLFConstants.SCRATCH_VALUE)
-          || result.equals(GTLFConstants.ABORT_VALUE));
-    }
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.io.File;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import org.apache.beehive.test.tools.tch.util.gtlf.GTLFConstants;
+import org.apache.beehive.test.tools.tch.util.gtlf.GTLFEntityResolver;
+
+/**
+ * Given a GTLF file, throws a BuildException is the GTLF is malformed,
+ * or if there have been any FAILURE/SCRATCH/SKIP/ABORT results in the 
+ * run.
+ * 
+ * Created on Jan 8, 2004
+ */
+public class FailureCheckTask extends Task
+{
+  private File gtlfFile = null;
+
+  public void setGTLFFile(File f)
+  {
+    gtlfFile = f;
+  }
+
+  public void execute()
+  {
+    if (gtlfFile == null)
+      throw new BuildException("${gtlffile} must be set");
+    if (!gtlfFile.exists())
+      throw new BuildException(
+        "Cannot find gtlffile: " + gtlfFile.getAbsolutePath());
+
+    parseGTLF();
+
+    log(
+      "Did not find any problems with this run, not failing the build",
+      Project.MSG_VERBOSE);
+  }
+
+  private void parseGTLF()
+  {
+    GTLFParser parser = null;
+    try
+    {
+      SAXParserFactory factory = SAXParserFactory.newInstance();
+      SAXParser saxParser = factory.newSAXParser();
+      parser = new GTLFParser();
+      saxParser.parse(gtlfFile, parser);
+    }
+    catch (Exception ex)
+    {
+      throw new BuildException(ex);
+    }
+    if (parser.encounteredFailure())
+      throw new BuildException("Found at least one bad test");
+  }
+
+  private class GTLFParser extends DefaultHandler
+  {
+    private boolean encounteredFailure = false;
+
+    public InputSource resolveEntity(String publicId, String systemId)
+      throws SAXException
+    {
+      return new GTLFEntityResolver().resolveEntity(publicId, systemId);
+    }
+
+    public void startElement(
+      String namespaceURI,
+      String localName,
+      String qName,
+      Attributes attr)
+      throws SAXException
+    {
+      if (GTLFConstants.TEST_RESULT_ELEMENT.equals(qName))
+      {
+        if (isBadResult(attr
+          .getValue(GTLFConstants.PARAM_RESULT_RESULT)
+          .trim()))
+          encounteredFailure = true;
+      }
+    }
+
+    public boolean encounteredFailure()
+    {
+      return encounteredFailure;
+    }
+
+    public boolean isBadResult(String result)
+    {
+      return (
+        result.equals(GTLFConstants.FAILURE_VALUE)
+          || result.equals(GTLFConstants.SKIP_VALUE)
+          || result.equals(GTLFConstants.SCRATCH_VALUE)
+          || result.equals(GTLFConstants.ABORT_VALUE));
+    }
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FailureCheckTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FileExistsTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FileExistsTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FileExistsTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FileExistsTask.java Fri Aug 12 08:12:28 2005
@@ -1,69 +1,69 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-
-/**
- * This task is to use in place of the Available
- * task, directly causing a build failure
- * 
- */
-
-public class FileExistsTask extends Task
-{
-  private String dirName = null; //optional
-  private String fileName = null;
-  private String message = null;
-  private boolean required = true;
-
-  public void setDir(String in)
-  {
-    dirName = in;
-  }
-
-  public void setFile(String in)
-  {
-    fileName = in;
-  }
-
-  public void setMessage(String in)
-  {
-    message = in;
-  }
-
-  public void setRequired(boolean in)
-  {
-    required = in;
-  }
-
-  public void execute() throws BuildException
-  {
-    try
-    {
-      String fullFileName = null;
-
-      if (!required && fileName != null)
-      {
-        if (fileName.startsWith("$"))
-          return; //OK to have no file set
-      }
-
-      if (!TchUtils.isAbsolutePath(fileName))
-        fullFileName = dirName + "/" + fileName;
-      else
-        fullFileName = fileName;
-
-      //just check the file, don't read it
-      new FileReader(fullFileName);
-    }
-    catch (FileNotFoundException ex)
-    {
-      throw new BuildException(message + fileName);
-    }
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+
+/**
+ * This task is to use in place of the Available
+ * task, directly causing a build failure
+ * 
+ */
+
+public class FileExistsTask extends Task
+{
+  private String dirName = null; //optional
+  private String fileName = null;
+  private String message = null;
+  private boolean required = true;
+
+  public void setDir(String in)
+  {
+    dirName = in;
+  }
+
+  public void setFile(String in)
+  {
+    fileName = in;
+  }
+
+  public void setMessage(String in)
+  {
+    message = in;
+  }
+
+  public void setRequired(boolean in)
+  {
+    required = in;
+  }
+
+  public void execute() throws BuildException
+  {
+    try
+    {
+      String fullFileName = null;
+
+      if (!required && fileName != null)
+      {
+        if (fileName.startsWith("$"))
+          return; //OK to have no file set
+      }
+
+      if (!TchUtils.isAbsolutePath(fileName))
+        fullFileName = dirName + "/" + fileName;
+      else
+        fullFileName = fileName;
+
+      //just check the file, don't read it
+      new FileReader(fullFileName);
+    }
+    catch (FileNotFoundException ex)
+    {
+      throw new BuildException(message + fileName);
+    }
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FileExistsTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ForceOverrideUserPropertyTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ForceOverrideUserPropertyTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ForceOverrideUserPropertyTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ForceOverrideUserPropertyTask.java Fri Aug 12 08:12:28 2005
@@ -1,50 +1,50 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class ForceOverrideUserPropertyTask
-  extends Task
-{
-  String sourcePropName = null;
-  String destinationPropName = null;
-
-  public void setSourceProp(String in)
-  {
-    sourcePropName = in;
-  }
-
-  public void setDestinationProp(String in)
-  {
-    destinationPropName = in;
-  }
-
-  public void execute()
-    throws BuildException
-  {
-    if (sourcePropName == null)
-      throw new BuildException("sourcePropName must be set");
-    if (destinationPropName == null)
-      throw new BuildException("destinationPropName must be set");
-
-    if (getGlobalProperty(sourcePropName) != null)
-    {
-      log("Overriding " + destinationPropName + ":" + 
-          getGlobalProperty(destinationPropName) + " with " + 
-          sourcePropName + ":" + getGlobalProperty(sourcePropName));
-      setGlobalProperty(destinationPropName, getGlobalProperty(sourcePropName));
-    }
-    else
-      log(sourcePropName + " not set, giving up");
-  }
-
-  private String getGlobalProperty(String propName)
-  {
-    return getProject().getProperty(propName);
-  }
-
-  private void setGlobalProperty(String propName, String propValue)
-  {
-    getProject().setUserProperty(propName, propValue);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+public class ForceOverrideUserPropertyTask
+  extends Task
+{
+  String sourcePropName = null;
+  String destinationPropName = null;
+
+  public void setSourceProp(String in)
+  {
+    sourcePropName = in;
+  }
+
+  public void setDestinationProp(String in)
+  {
+    destinationPropName = in;
+  }
+
+  public void execute()
+    throws BuildException
+  {
+    if (sourcePropName == null)
+      throw new BuildException("sourcePropName must be set");
+    if (destinationPropName == null)
+      throw new BuildException("destinationPropName must be set");
+
+    if (getGlobalProperty(sourcePropName) != null)
+    {
+      log("Overriding " + destinationPropName + ":" + 
+          getGlobalProperty(destinationPropName) + " with " + 
+          sourcePropName + ":" + getGlobalProperty(sourcePropName));
+      setGlobalProperty(destinationPropName, getGlobalProperty(sourcePropName));
+    }
+    else
+      log(sourcePropName + " not set, giving up");
+  }
+
+  private String getGlobalProperty(String propName)
+  {
+    return getProject().getProperty(propName);
+  }
+
+  private void setGlobalProperty(String propName, String propValue)
+  {
+    getProject().setUserProperty(propName, propValue);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ForceOverrideUserPropertyTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FrameworkTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FrameworkTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FrameworkTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FrameworkTask.java Fri Aug 12 08:12:28 2005
@@ -1,39 +1,39 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.BuildException;
-
-import org.apache.beehive.test.tools.tch.api.UserTask;
-
-/**
- */
-
-public class FrameworkTask extends UserTask
-{
-  private String message = null;
-
-  public void setMessage(String in)
-  {
-    message = in;
-  }
-
-  public boolean run() throws BuildException
-  {
-    inform("Params are: " + getParameters());
-    inform("Process Engine is: " + getProcessEngine());
-    if (message != null)
-      inform(message);
-    else
-      inform("Message from FrameworkTask");
-
-    Integer count = new Integer(0);
-    if (getSharedState().containsKey("test"))
-    {
-      count = (Integer)getSharedState().get("test");
-      log("Read \"" + count + "\" from shared state.");
-    }
-    getSharedState().put("test", new Integer(count.intValue() + 1));
-    log("Wrote \"" + (int) (count.intValue() + 1) + "\" to shared state.");
-
-    return true;
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.BuildException;
+
+import org.apache.beehive.test.tools.tch.api.UserTask;
+
+/**
+ */
+
+public class FrameworkTask extends UserTask
+{
+  private String message = null;
+
+  public void setMessage(String in)
+  {
+    message = in;
+  }
+
+  public boolean run() throws BuildException
+  {
+    inform("Params are: " + getParameters());
+    inform("Process Engine is: " + getProcessEngine());
+    if (message != null)
+      inform(message);
+    else
+      inform("Message from FrameworkTask");
+
+    Integer count = new Integer(0);
+    if (getSharedState().containsKey("test"))
+    {
+      count = (Integer)getSharedState().get("test");
+      log("Read \"" + count + "\" from shared state.");
+    }
+    getSharedState().put("test", new Integer(count.intValue() + 1));
+    log("Wrote \"" + (int) (count.intValue() + 1) + "\" to shared state.");
+
+    return true;
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/FrameworkTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GCTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GCTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GCTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GCTask.java Fri Aug 12 08:12:28 2005
@@ -1,17 +1,17 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class GCTask
-  extends Task
-{
-
-  public void execute()
-    throws BuildException
-  {
-    log("Calling System.gc()");
-    System.gc();
-  }  
-
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+public class GCTask
+  extends Task
+{
+
+  public void execute()
+    throws BuildException
+  {
+    log("Calling System.gc()");
+    System.gc();
+  }  
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GCTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GenRunIdTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GenRunIdTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GenRunIdTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GenRunIdTask.java Fri Aug 12 08:12:28 2005
@@ -1,42 +1,42 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.BuildException;
-
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-
-/**
- * GenRunIdTask is an ant task that generates a new run ID for GTLF
- *
- * it's used with an attribute called "outputproperty" which specifies the
- * the ant property to set the run id to
- * 
- * @see org.apache.beehive.test.tools.tch.util.TchUtils
- */
-public class GenRunIdTask extends Task
-{
-  String outputprop;
-
-  public GenRunIdTask()
-  {
-  }
-
-  public void setOutputProperty(String outputprop)
-  {
-    this.outputprop = outputprop;
-  }
-  public void execute() throws BuildException
-  {
-    try
-    {
-      // if the property is already set, no point setting it
-      if (project.getProperty(outputprop) == null)
-        project.setNewProperty(outputprop, TchUtils.getUniqueRunID());
-    }
-    catch (Exception e)
-    {
-      throw new BuildException("GenRunIdTask failed", e);
-    }
-
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+
+/**
+ * GenRunIdTask is an ant task that generates a new run ID for GTLF
+ *
+ * it's used with an attribute called "outputproperty" which specifies the
+ * the ant property to set the run id to
+ * 
+ * @see org.apache.beehive.test.tools.tch.util.TchUtils
+ */
+public class GenRunIdTask extends Task
+{
+  String outputprop;
+
+  public GenRunIdTask()
+  {
+  }
+
+  public void setOutputProperty(String outputprop)
+  {
+    this.outputprop = outputprop;
+  }
+  public void execute() throws BuildException
+  {
+    try
+    {
+      // if the property is already set, no point setting it
+      if (project.getProperty(outputprop) == null)
+        project.setNewProperty(outputprop, TchUtils.getUniqueRunID());
+    }
+    catch (Exception e)
+    {
+      throw new BuildException("GenRunIdTask failed", e);
+    }
+
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GenRunIdTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GetFilename.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GetFilename.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GetFilename.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GetFilename.java Fri Aug 12 08:12:28 2005
@@ -1,46 +1,46 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * Given a path, sets a property to the filename that path points to, without extension.
- */
-public class GetFilename extends Task
-{
-  private String destinationPropName = null;
-  private String path = null;
-
-  public void setPath(String in)
-  {
-    path = in;
-  }
-
-  public void setPropertyName(String in)
-  {
-    destinationPropName = in;
-  }
-
-  public void execute()
-  {
-    if (destinationPropName == null)
-      throw new BuildException("propertyname must be set");
-    File f = new File(path);
-    if (!f.isFile())
-    {
-      log(
-        path + " does not point to a file, not setting property ",
-        Project.MSG_VERBOSE);
-      return;
-    }
-    int index = f.getName().indexOf(".");
-    if (index == -1)
-      index = f.getName().length();
-    getProject().setProperty(
-      destinationPropName,
-      f.getName().substring(0, index));
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+/**
+ * Given a path, sets a property to the filename that path points to, without extension.
+ */
+public class GetFilename extends Task
+{
+  private String destinationPropName = null;
+  private String path = null;
+
+  public void setPath(String in)
+  {
+    path = in;
+  }
+
+  public void setPropertyName(String in)
+  {
+    destinationPropName = in;
+  }
+
+  public void execute()
+  {
+    if (destinationPropName == null)
+      throw new BuildException("propertyname must be set");
+    File f = new File(path);
+    if (!f.isFile())
+    {
+      log(
+        path + " does not point to a file, not setting property ",
+        Project.MSG_VERBOSE);
+      return;
+    }
+    int index = f.getName().indexOf(".");
+    if (index == -1)
+      index = f.getName().length();
+    getProject().setProperty(
+      destinationPropName,
+      f.getName().substring(0, index));
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/GetFilename.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/LoadFileTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/LoadFileTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/LoadFileTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/LoadFileTask.java Fri Aug 12 08:12:28 2005
@@ -1,34 +1,34 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.io.File;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.apache.beehive.test.tools.tch.util.TchUtils;
-
-public class LoadFileTask
-  extends Task
-{
-  private File file = null;
-  private String property = null;
-  
-  public void setProperty(String in)
-  {
-    property = in;
-  }
-  
-  public void setSrcFile(File in)
-  {
-    file = in;
-  }
-
-  public void execute()
-    throws BuildException
-  {
-    getProject()
-      .setProperty(property,
-                   TchUtils
-                   .getContentsAsString(file));
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.io.File;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import org.apache.beehive.test.tools.tch.util.TchUtils;
+
+public class LoadFileTask
+  extends Task
+{
+  private File file = null;
+  private String property = null;
+  
+  public void setProperty(String in)
+  {
+    property = in;
+  }
+  
+  public void setSrcFile(File in)
+  {
+    file = in;
+  }
+
+  public void execute()
+    throws BuildException
+  {
+    getProject()
+      .setProperty(property,
+                   TchUtils
+                   .getContentsAsString(file));
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/LoadFileTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ParseP4Output.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ParseP4Output.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ParseP4Output.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ParseP4Output.java Fri Aug 12 08:12:28 2005
@@ -1,40 +1,40 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.util.StringTokenizer;
-
-import org.apache.tools.ant.Task;
-
-public class ParseP4Output extends Task
-{
-  private String p4output = null;
-  private String changeNumProp = null;
-
-  public void setP4Output(String s)
-  {
-    p4output = s;
-  }
-
-  public void setP4ChangeNumProperty(String s)
-  {
-    changeNumProp = s;
-  }
-
-  public void execute()
-  {
-    String changeNum = word(p4output, 1);
-    getProject().setProperty(changeNumProp, changeNum);
-  }
-
-  private static String word(String s, int n)
-  {
-    StringTokenizer st = new StringTokenizer(s);
-    if (!st.hasMoreTokens())
-      return "<no change number>";
-    for (; n > 0; n--)
-    {
-      st.nextToken();
-    }
-    return st.nextToken();
-  }
-
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.util.StringTokenizer;
+
+import org.apache.tools.ant.Task;
+
+public class ParseP4Output extends Task
+{
+  private String p4output = null;
+  private String changeNumProp = null;
+
+  public void setP4Output(String s)
+  {
+    p4output = s;
+  }
+
+  public void setP4ChangeNumProperty(String s)
+  {
+    changeNumProp = s;
+  }
+
+  public void execute()
+  {
+    String changeNum = word(p4output, 1);
+    getProject().setProperty(changeNumProp, changeNum);
+  }
+
+  private static String word(String s, int n)
+  {
+    StringTokenizer st = new StringTokenizer(s);
+    if (!st.hasMoreTokens())
+      return "<no change number>";
+    for (; n > 0; n--)
+    {
+      st.nextToken();
+    }
+    return st.nextToken();
+  }
+
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ParseP4Output.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/PropertyMappingTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/PropertyMappingTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/PropertyMappingTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/PropertyMappingTask.java Fri Aug 12 08:12:28 2005
@@ -1,110 +1,110 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.regexp.RE;
-import org.apache.regexp.RECompiler;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.apache.beehive.test.tools.tch.util.OrderedMap;
-
-public class PropertyMappingTask
-  extends Task
-{
-  private static RECompiler reCompiler = new RECompiler();
-  String sourcePropName = null;
-  Map propertyMapping = new OrderedMap();
-  String destinationPropName = null;
-  boolean exactMatch = true;
-
-  public void setExactMatch(boolean in)
-  {
-    exactMatch = in;
-  }
-
-  public void setSourceProp(String in)
-  {
-    sourcePropName = in;
-  }
-
-  public void setDestinationProp(String in)
-  {
-    destinationPropName = in;
-  }
-
-  public void addConfiguredValueMapping(ValueElement in)
-  {
-    propertyMapping.put(in.getVal1(), in.getVal2());
-  }
-
-  public void execute() throws BuildException
-  {
-    if (sourcePropName == null)
-      throw new BuildException("sourcePropName must be set");
-    if (destinationPropName == null)
-      throw new BuildException("destinationPropName must be set");
-
-    String keyValue = getMappedValue();
-    if (keyValue != null)
-    {
-      log("Setting " + destinationPropName + " to " + keyValue);
-      setGlobalProperty(destinationPropName, keyValue);
-    }
-  }
-
-  private String getGlobalProperty(String propName)
-  {
-    return getProject().getProperty(propName);
-  }
-
-  private void setGlobalProperty(String propName, String propValue)
-  {
-    getProject().setUserProperty(propName, propValue);
-  }
-
-  private String getMappedValue()
-  {
-    String sourcePropValue = getGlobalProperty(sourcePropName);
-    String keyName = null;
-    String keyValue = null;
-    if (exactMatch)
-    {
-      if (propertyMapping.containsKey(sourcePropValue))
-        keyName = sourcePropValue;
-    }
-    else
-    {
-      for (Iterator iter = propertyMapping.keySet().iterator();
-        iter.hasNext();
-        )
-      {
-        String key = (String)iter.next();
-        // use a default regexp here
-        //log("key is: " + key);
-        String regExp = (".*?" + key + ".*?");
-        try
-        {
-          RE re = new RE(regExp);
-          if (re.match(sourcePropValue))
-          {
-            keyName = key;
-            break;
-          }
-        }
-        catch (Exception ex)
-        {
-          // if anything goes wrong with regexp, that's too bad, but
-          // we don't want it to fail the build
-          //log("Caught: " + ex + ", while running regex, swallowing");
-        }
-      }
-    }
-    if (keyName != null)
-    {
-      keyValue = (String)propertyMapping.get(keyName);
-    }
-    return keyValue;
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.regexp.RE;
+import org.apache.regexp.RECompiler;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import org.apache.beehive.test.tools.tch.util.OrderedMap;
+
+public class PropertyMappingTask
+  extends Task
+{
+  private static RECompiler reCompiler = new RECompiler();
+  String sourcePropName = null;
+  Map propertyMapping = new OrderedMap();
+  String destinationPropName = null;
+  boolean exactMatch = true;
+
+  public void setExactMatch(boolean in)
+  {
+    exactMatch = in;
+  }
+
+  public void setSourceProp(String in)
+  {
+    sourcePropName = in;
+  }
+
+  public void setDestinationProp(String in)
+  {
+    destinationPropName = in;
+  }
+
+  public void addConfiguredValueMapping(ValueElement in)
+  {
+    propertyMapping.put(in.getVal1(), in.getVal2());
+  }
+
+  public void execute() throws BuildException
+  {
+    if (sourcePropName == null)
+      throw new BuildException("sourcePropName must be set");
+    if (destinationPropName == null)
+      throw new BuildException("destinationPropName must be set");
+
+    String keyValue = getMappedValue();
+    if (keyValue != null)
+    {
+      log("Setting " + destinationPropName + " to " + keyValue);
+      setGlobalProperty(destinationPropName, keyValue);
+    }
+  }
+
+  private String getGlobalProperty(String propName)
+  {
+    return getProject().getProperty(propName);
+  }
+
+  private void setGlobalProperty(String propName, String propValue)
+  {
+    getProject().setUserProperty(propName, propValue);
+  }
+
+  private String getMappedValue()
+  {
+    String sourcePropValue = getGlobalProperty(sourcePropName);
+    String keyName = null;
+    String keyValue = null;
+    if (exactMatch)
+    {
+      if (propertyMapping.containsKey(sourcePropValue))
+        keyName = sourcePropValue;
+    }
+    else
+    {
+      for (Iterator iter = propertyMapping.keySet().iterator();
+        iter.hasNext();
+        )
+      {
+        String key = (String)iter.next();
+        // use a default regexp here
+        //log("key is: " + key);
+        String regExp = (".*?" + key + ".*?");
+        try
+        {
+          RE re = new RE(regExp);
+          if (re.match(sourcePropValue))
+          {
+            keyName = key;
+            break;
+          }
+        }
+        catch (Exception ex)
+        {
+          // if anything goes wrong with regexp, that's too bad, but
+          // we don't want it to fail the build
+          //log("Caught: " + ex + ", while running regex, swallowing");
+        }
+      }
+    }
+    if (keyName != null)
+    {
+      keyValue = (String)propertyMapping.get(keyName);
+    }
+    return keyValue;
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/PropertyMappingTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RegExpTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RegExpTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RegExpTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RegExpTask.java Fri Aug 12 08:12:28 2005
@@ -1,64 +1,64 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.regexp.RE;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class RegExpTask extends Task
-{
-  String sourcePropName = null;
-  String destinationPropName = null;
-  String regExp = null;
-
-  public void setRegExp(String in)
-  {
-    regExp = in;
-  }
-
-  public void setSourceProp(String in)
-  {
-    sourcePropName = in;
-  }
-
-  public void setDestinationProp(String in)
-  {
-    destinationPropName = in;
-  }
-
-  public void execute() throws BuildException
-  {
-    if (sourcePropName == null)
-      throw new BuildException("sourcePropName must be set");
-    if (destinationPropName == null)
-      throw new BuildException("destinationPropName must be set");
-    if (regExp == null)
-      throw new BuildException("regExp must be set");
-
-    try
-    {
-      RE re = new RE(regExp);
-      if (re.match(getGlobalProperty(sourcePropName)));
-      {
-        // assuming expression had parens for now
-        if (re.getParen(1) != null)
-          setGlobalProperty(destinationPropName, re.getParen(1));
-      }
-    }
-    catch (Exception ex)
-    {
-      // if anything goes wrong with regexp, that's too bad, but
-      // we don't want it to fail the build
-      //log("Caught: " + ex + ", while running regex, swallowing");
-    }
-  }
-
-  private String getGlobalProperty(String propName)
-  {
-    return getProject().getProperty(propName);
-  }
-
-  private void setGlobalProperty(String propName, String propValue)
-  {
-    getProject().setUserProperty(propName, propValue);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.regexp.RE;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+public class RegExpTask extends Task
+{
+  String sourcePropName = null;
+  String destinationPropName = null;
+  String regExp = null;
+
+  public void setRegExp(String in)
+  {
+    regExp = in;
+  }
+
+  public void setSourceProp(String in)
+  {
+    sourcePropName = in;
+  }
+
+  public void setDestinationProp(String in)
+  {
+    destinationPropName = in;
+  }
+
+  public void execute() throws BuildException
+  {
+    if (sourcePropName == null)
+      throw new BuildException("sourcePropName must be set");
+    if (destinationPropName == null)
+      throw new BuildException("destinationPropName must be set");
+    if (regExp == null)
+      throw new BuildException("regExp must be set");
+
+    try
+    {
+      RE re = new RE(regExp);
+      if (re.match(getGlobalProperty(sourcePropName)));
+      {
+        // assuming expression had parens for now
+        if (re.getParen(1) != null)
+          setGlobalProperty(destinationPropName, re.getParen(1));
+      }
+    }
+    catch (Exception ex)
+    {
+      // if anything goes wrong with regexp, that's too bad, but
+      // we don't want it to fail the build
+      //log("Caught: " + ex + ", while running regex, swallowing");
+    }
+  }
+
+  private String getGlobalProperty(String propName)
+  {
+    return getProject().getProperty(propName);
+  }
+
+  private void setGlobalProperty(String propName, String propValue)
+  {
+    getProject().setUserProperty(propName, propValue);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RegExpTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RemoveFromPathTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RemoveFromPathTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RemoveFromPathTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RemoveFromPathTask.java Fri Aug 12 08:12:28 2005
@@ -1,71 +1,71 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-import org.apache.beehive.test.tools.tch.util.GeneralUtil;
-
-public class RemoveFromPathTask extends Task
-{
-  private Collection removeElements = new ArrayList();
-
-  private String sourcePathPropName = null, destinationPathPropName = null;
-
-  public void setSourcePathProp(String in)
-  {
-    sourcePathPropName = in.trim();
-  }
-
-  public void setDestinationPathProp(String in)
-  {
-    destinationPathPropName = in.trim();
-  }
-
-  public void setRemoveResource(String in)
-  {
-    removeElements.add(in.trim());
-  }
-
-  public void addConfiguredElement(ArgElement in)
-  {
-    removeElements.add(in.getValue().trim());
-  }
-
-  public void execute() throws BuildException
-  {
-    if (sourcePathPropName == null)
-      throw new BuildException("sourcePathPropName must be set");
-    if (destinationPathPropName == null)
-      throw new BuildException("destinationPathPropName must be set");
-    if (removeElements.isEmpty())
-      throw new BuildException("Nothing to remove from path...");
-
-    if (getGlobalProperty(sourcePathPropName) != null)
-    {
-      String path = getGlobalProperty(sourcePathPropName);
-      log("Removing " + removeElements + " from " + sourcePathPropName);
-
-      for (Iterator iter = removeElements.iterator(); iter.hasNext();)
-        path = GeneralUtil.removeFromPath(path, (String)iter.next());
-
-      log("Setting property " + destinationPathPropName);
-      setGlobalProperty(destinationPathPropName, path);
-    }
-    else
-      log(sourcePathPropName + " not set, giving up");
-  }
-
-  private String getGlobalProperty(String propName)
-  {
-    return getProject().getProperty(propName);
-  }
-
-  private void setGlobalProperty(String propName, String propValue)
-  {
-    getProject().setUserProperty(propName, propValue);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+import org.apache.beehive.test.tools.tch.util.GeneralUtil;
+
+public class RemoveFromPathTask extends Task
+{
+  private Collection removeElements = new ArrayList();
+
+  private String sourcePathPropName = null, destinationPathPropName = null;
+
+  public void setSourcePathProp(String in)
+  {
+    sourcePathPropName = in.trim();
+  }
+
+  public void setDestinationPathProp(String in)
+  {
+    destinationPathPropName = in.trim();
+  }
+
+  public void setRemoveResource(String in)
+  {
+    removeElements.add(in.trim());
+  }
+
+  public void addConfiguredElement(ArgElement in)
+  {
+    removeElements.add(in.getValue().trim());
+  }
+
+  public void execute() throws BuildException
+  {
+    if (sourcePathPropName == null)
+      throw new BuildException("sourcePathPropName must be set");
+    if (destinationPathPropName == null)
+      throw new BuildException("destinationPathPropName must be set");
+    if (removeElements.isEmpty())
+      throw new BuildException("Nothing to remove from path...");
+
+    if (getGlobalProperty(sourcePathPropName) != null)
+    {
+      String path = getGlobalProperty(sourcePathPropName);
+      log("Removing " + removeElements + " from " + sourcePathPropName);
+
+      for (Iterator iter = removeElements.iterator(); iter.hasNext();)
+        path = GeneralUtil.removeFromPath(path, (String)iter.next());
+
+      log("Setting property " + destinationPathPropName);
+      setGlobalProperty(destinationPathPropName, path);
+    }
+    else
+      log(sourcePathPropName + " not set, giving up");
+  }
+
+  private String getGlobalProperty(String propName)
+  {
+    return getProject().getProperty(propName);
+  }
+
+  private void setGlobalProperty(String propName, String propValue)
+  {
+    getProject().setUserProperty(propName, propValue);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/RemoveFromPathTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SetPropIfCanPing.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SetPropIfCanPing.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SetPropIfCanPing.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SetPropIfCanPing.java Fri Aug 12 08:12:28 2005
@@ -1,80 +1,80 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.net.Socket;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- */
-public class SetPropIfCanPing extends Task
-{
-  public static final String PROPERTY_ATTR = "property",
-    HOST_ATTR = "host",
-    PORT_ATTR = "port";
-
-  String propToSetName = null;
-  String propToSetValue = "true"; // default
-  String host = null;
-  String portString = null;
-
-  public void setProperty(String in)
-  {
-    propToSetName = in;
-  }
-
-  public void setValue(String in)
-  {
-    propToSetValue = in;
-  }
-  
-  public void setHost(String in)
-  {
-  	host = in;
-  }
-  
-  public void setPort(String in)
-  {
-  	portString = in;
-  }
-
-  public void execute() 
-  {
-  	if (propToSetName == null)
-  	{
-  	  throw new BuildException(PROPERTY_ATTR + " must be set");
-  	}
-  	if (host == null)
-  	{
-  	  throw new BuildException(HOST_ATTR + " must be set");
-  	}
-  	if (portString == null)
-  	{
-  	  throw new BuildException(PORT_ATTR + " must be set");
-  	}
-  	
-  	int port = Integer.parseInt(portString);
-  	
-  	Socket s = null;
-  	try
-  	{
-  	  s = new Socket(host, port);
-  	  log("Able to ping " + host + ":" + port + ", setting " + propToSetName + "=" + propToSetValue);
-  	  setProperty(propToSetName, propToSetValue);
-  	} catch (Exception ex)
-  	{
-  	  log("Unable to ping " + host + ":" + port + ", not setting " + propToSetName);
-  	} finally
-  	{
-  	  try
-  	  {
-  	    s.close();
-  	  } catch (Exception ex) {}
-  	}
-  }
-  
-  private void setProperty(String propName, String propValue)
-  {
-    getProject().setProperty(propName, propValue);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.net.Socket;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ */
+public class SetPropIfCanPing extends Task
+{
+  public static final String PROPERTY_ATTR = "property",
+    HOST_ATTR = "host",
+    PORT_ATTR = "port";
+
+  String propToSetName = null;
+  String propToSetValue = "true"; // default
+  String host = null;
+  String portString = null;
+
+  public void setProperty(String in)
+  {
+    propToSetName = in;
+  }
+
+  public void setValue(String in)
+  {
+    propToSetValue = in;
+  }
+  
+  public void setHost(String in)
+  {
+  	host = in;
+  }
+  
+  public void setPort(String in)
+  {
+  	portString = in;
+  }
+
+  public void execute() 
+  {
+  	if (propToSetName == null)
+  	{
+  	  throw new BuildException(PROPERTY_ATTR + " must be set");
+  	}
+  	if (host == null)
+  	{
+  	  throw new BuildException(HOST_ATTR + " must be set");
+  	}
+  	if (portString == null)
+  	{
+  	  throw new BuildException(PORT_ATTR + " must be set");
+  	}
+  	
+  	int port = Integer.parseInt(portString);
+  	
+  	Socket s = null;
+  	try
+  	{
+  	  s = new Socket(host, port);
+  	  log("Able to ping " + host + ":" + port + ", setting " + propToSetName + "=" + propToSetValue);
+  	  setProperty(propToSetName, propToSetValue);
+  	} catch (Exception ex)
+  	{
+  	  log("Unable to ping " + host + ":" + port + ", not setting " + propToSetName);
+  	} finally
+  	{
+  	  try
+  	  {
+  	    s.close();
+  	  } catch (Exception ex) {}
+  	}
+  }
+  
+  private void setProperty(String propName, String propValue)
+  {
+    getProject().setProperty(propName, propValue);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SetPropIfCanPing.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SimpleDateFormatTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SimpleDateFormatTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SimpleDateFormatTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SimpleDateFormatTask.java Fri Aug 12 08:12:28 2005
@@ -1,40 +1,40 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-public class SimpleDateFormatTask
-  extends Task
-{
-  SimpleDateFormat dateFormat = null;
-  String destinationPropName = null;
-
-  public void setDateFormat(String in)
-  {
-    dateFormat = new SimpleDateFormat(in);
-  }
-
-  public void setDestinationProp(String in)
-  {
-    destinationPropName = in;
-  }
-
-  public void execute()
-    throws BuildException
-  {
-    if (destinationPropName == null)
-      throw new BuildException("destinationPropName must be set");
-    if (dateFormat == null)
-      throw new BuildException("dateFormat must be set");
-
-    setGlobalProperty(destinationPropName, dateFormat.format(new Date())); 
-  }
-
-  private void setGlobalProperty(String propName, String propValue)
-  {
-    getProject().setUserProperty(propName, propValue);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+public class SimpleDateFormatTask
+  extends Task
+{
+  SimpleDateFormat dateFormat = null;
+  String destinationPropName = null;
+
+  public void setDateFormat(String in)
+  {
+    dateFormat = new SimpleDateFormat(in);
+  }
+
+  public void setDestinationProp(String in)
+  {
+    destinationPropName = in;
+  }
+
+  public void execute()
+    throws BuildException
+  {
+    if (destinationPropName == null)
+      throw new BuildException("destinationPropName must be set");
+    if (dateFormat == null)
+      throw new BuildException("dateFormat must be set");
+
+    setGlobalProperty(destinationPropName, dateFormat.format(new Date())); 
+  }
+
+  private void setGlobalProperty(String propName, String propValue)
+  {
+    getProject().setUserProperty(propName, propValue);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/SimpleDateFormatTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/Text.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/Text.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/Text.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/Text.java Fri Aug 12 08:12:28 2005
@@ -1,17 +1,17 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-// simple data container
-public class Text
-{
-  private String text = null;
-
-  public void addText(String in)
-  {
-    text = in;
-  }
-
-  public String getText()
-  {
-    return text;
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+// simple data container
+public class Text
+{
+  private String text = null;
+
+  public void addText(String in)
+  {
+    text = in;
+  }
+
+  public String getText()
+  {
+    return text;
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/Text.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ThrowBuildExceptionTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ThrowBuildExceptionTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ThrowBuildExceptionTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ThrowBuildExceptionTask.java Fri Aug 12 08:12:28 2005
@@ -1,33 +1,33 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-
-/**
- * Very handy, always throws a BuildException, with configurable exception
- * message!!
- */
-
-public class ThrowBuildExceptionTask
-  extends Task
-{
-  private String message = "";
-  
-  public void setMessage(String in)
-  {
-    message = in;
-  }
-  
-  public void execute()
-    throws BuildException
-  {
-    try
-    {
-        throw new Exception("FOO");  
-    }
-    catch(Exception ex)
-    {
-        throw new BuildException(message, ex, getLocation());
-    }
-  }
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+
+/**
+ * Very handy, always throws a BuildException, with configurable exception
+ * message!!
+ */
+
+public class ThrowBuildExceptionTask
+  extends Task
+{
+  private String message = "";
+  
+  public void setMessage(String in)
+  {
+    message = in;
+  }
+  
+  public void execute()
+    throws BuildException
+  {
+    try
+    {
+        throw new Exception("FOO");  
+    }
+    catch(Exception ex)
+    {
+        throw new BuildException(message, ex, getLocation());
+    }
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ThrowBuildExceptionTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/UsageTask.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/UsageTask.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/UsageTask.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/UsageTask.java Fri Aug 12 08:12:28 2005
@@ -1,14 +1,14 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-import org.apache.tools.ant.taskdefs.ExecTask;
-
-/**
- * This task is just here so that we can
- * have our own label for the task, for
- * print out purposes
- */
-
-public class UsageTask
-  extends ExecTask
-{
-}
+package org.apache.beehive.test.tools.tch.util.ant;
+
+import org.apache.tools.ant.taskdefs.ExecTask;
+
+/**
+ * This task is just here so that we can
+ * have our own label for the task, for
+ * print out purposes
+ */
+
+public class UsageTask
+  extends ExecTask
+{
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/UsageTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ValueElement.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ValueElement.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ValueElement.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ValueElement.java Fri Aug 12 08:12:28 2005
@@ -1,28 +1,28 @@
-package org.apache.beehive.test.tools.tch.util.ant;
-
-public class ValueElement
-{
-  private String val1 = null;
-  private String val2 = null;
-
-  public void setVal1(String in)
-  {
-    val1 = in;
-  }
-
-  public String getVal1()
-  {
-    return val1;
-  }
-
-  public void setVal2(String in)
-  {
-    val2 = in;
-  }
-
-  public String getVal2()
-  {
-    return val2;
-  }
-}
-
+package org.apache.beehive.test.tools.tch.util.ant;
+
+public class ValueElement
+{
+  private String val1 = null;
+  private String val2 = null;
+
+  public void setVal1(String in)
+  {
+    val1 = in;
+  }
+
+  public String getVal1()
+  {
+    return val1;
+  }
+
+  public void setVal2(String in)
+  {
+    val2 = in;
+  }
+
+  public String getVal2()
+  {
+    return val2;
+  }
+}
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/ant/ValueElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/EnvVarResolutionException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/EnvVarResolutionException.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/EnvVarResolutionException.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/EnvVarResolutionException.java Fri Aug 12 08:12:28 2005
@@ -1,22 +1,22 @@
-package org.apache.beehive.test.tools.tch.util.env;
-
-import org.apache.beehive.test.tools.tch.util.NestedException;
-
-public class EnvVarResolutionException
-  extends NestedException
-{
-  public EnvVarResolutionException(String inMessage)
-  {
-    super(inMessage);
-  }
-  
-  public EnvVarResolutionException(Exception in)
-  {
-    super(in);
-  }
-
-  public EnvVarResolutionException(Exception inEx, String inMessage)
-  {
-    super(inEx, inMessage);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.env;
+
+import org.apache.beehive.test.tools.tch.util.NestedException;
+
+public class EnvVarResolutionException
+  extends NestedException
+{
+  public EnvVarResolutionException(String inMessage)
+  {
+    super(inMessage);
+  }
+  
+  public EnvVarResolutionException(Exception in)
+  {
+    super(in);
+  }
+
+  public EnvVarResolutionException(Exception inEx, String inMessage)
+  {
+    super(inEx, inMessage);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/EnvVarResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/Environment.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/Environment.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/Environment.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/Environment.java Fri Aug 12 08:12:28 2005
@@ -1,71 +1,71 @@
-package org.apache.beehive.test.tools.tch.util.env;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-public class Environment
-{
-  private static String GET_ENV_CMD = "env";
-
-  private static Map env = null;
-
-  private static boolean debug = false;
-
-  private static Exception thrownWhileInit = null;
-
-  public static String get(String key)
-    throws EnvVarResolutionException
-  {
-    initialize();
-    if (thrownWhileInit != null)
-      throw new EnvVarResolutionException(thrownWhileInit,
-                                          "Could not initialize environment map");
-    String var = (String)env.get(key);
-    if (var == null)
-      throw new EnvVarResolutionException("Cannot resolve env var:" + key);
-    return var;
-  }
-
-  private static synchronized void initialize()
-  {
-    if (env != null)
-      return;
-
-    env = new HashMap();
-  
-    try {
-      Process p = Runtime.getRuntime().exec(GET_ENV_CMD);
-      // read from process stream
-      BufferedReader reader = 
-        new BufferedReader(new InputStreamReader(p.getInputStream()));
-      String line = "";
-      while ((line = reader.readLine()) != null)
-      {
-        if (debug)
-          System.out.println("Reading line: " + line);
-        StringTokenizer st = new StringTokenizer(line, "=");
-        if (st.countTokens() == 1)
-          env.put(st.nextToken(), "");
-        else if (st.countTokens() == 2)
-          env.put(st.nextToken(), st.nextToken());
-      }
-      reader.close();
-    } catch (Exception ex)
-    {
-      thrownWhileInit = ex;
-    }
-  }
-
-  // testing
-
-  public static void main(String[] args)
-    throws Exception
-  {
-    System.out.println(Environment.get(args[0]));
-  }
-}
-
-
+package org.apache.beehive.test.tools.tch.util.env;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+public class Environment
+{
+  private static String GET_ENV_CMD = "env";
+
+  private static Map env = null;
+
+  private static boolean debug = false;
+
+  private static Exception thrownWhileInit = null;
+
+  public static String get(String key)
+    throws EnvVarResolutionException
+  {
+    initialize();
+    if (thrownWhileInit != null)
+      throw new EnvVarResolutionException(thrownWhileInit,
+                                          "Could not initialize environment map");
+    String var = (String)env.get(key);
+    if (var == null)
+      throw new EnvVarResolutionException("Cannot resolve env var:" + key);
+    return var;
+  }
+
+  private static synchronized void initialize()
+  {
+    if (env != null)
+      return;
+
+    env = new HashMap();
+  
+    try {
+      Process p = Runtime.getRuntime().exec(GET_ENV_CMD);
+      // read from process stream
+      BufferedReader reader = 
+        new BufferedReader(new InputStreamReader(p.getInputStream()));
+      String line = "";
+      while ((line = reader.readLine()) != null)
+      {
+        if (debug)
+          System.out.println("Reading line: " + line);
+        StringTokenizer st = new StringTokenizer(line, "=");
+        if (st.countTokens() == 1)
+          env.put(st.nextToken(), "");
+        else if (st.countTokens() == 2)
+          env.put(st.nextToken(), st.nextToken());
+      }
+      reader.close();
+    } catch (Exception ex)
+    {
+      thrownWhileInit = ex;
+    }
+  }
+
+  // testing
+
+  public static void main(String[] args)
+    throws Exception
+  {
+    System.out.println(Environment.get(args[0]));
+  }
+}
+
+

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/env/Environment.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConfigurationRuntimeException.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConfigurationRuntimeException.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConfigurationRuntimeException.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConfigurationRuntimeException.java Fri Aug 12 08:12:28 2005
@@ -1,22 +1,22 @@
-package org.apache.beehive.test.tools.tch.util.gtlf;
-
-import org.apache.beehive.test.tools.tch.util.NestedRuntimeException;
-
-public class GTLFConfigurationRuntimeException
-  extends NestedRuntimeException
-{
-  public GTLFConfigurationRuntimeException(String message)
-  {
-    super(message);
-  }
-
-  public GTLFConfigurationRuntimeException(Exception ex)
-  {
-    super(ex);
-  }
-
-  public GTLFConfigurationRuntimeException(Exception ex, String message)
-  {
-    super(ex, message);
-  }
-}
+package org.apache.beehive.test.tools.tch.util.gtlf;
+
+import org.apache.beehive.test.tools.tch.util.NestedRuntimeException;
+
+public class GTLFConfigurationRuntimeException
+  extends NestedRuntimeException
+{
+  public GTLFConfigurationRuntimeException(String message)
+  {
+    super(message);
+  }
+
+  public GTLFConfigurationRuntimeException(Exception ex)
+  {
+    super(ex);
+  }
+
+  public GTLFConfigurationRuntimeException(Exception ex, String message)
+  {
+    super(ex, message);
+  }
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConfigurationRuntimeException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConstants.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConstants.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConstants.java (original)
+++ beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConstants.java Fri Aug 12 08:12:28 2005
@@ -1,80 +1,80 @@
-package org.apache.beehive.test.tools.tch.util.gtlf;
-
-public interface GTLFConstants {
-
-  public static final String 
-
-    PARAM_NAME =                "name",
-    PARAM_VALUE =               "value",
-
-    TEST_LOG_ELEMENT =          "test-log",
-    HEADER_INFO_ELEMENT =       "header-info",
-
-    PARAM_RUNID =               "runid",
-    PARAM_TESTTYPE =            "testtype",
-    PARAM_CHANGE_NO =           "changenumber",
-    PARAM_RELEASE =             "release",
-    PARAM_LOAD =                "load",
-    PARAM_BRANCH =              "branch",
-    PARAM_PHASE =               "string",
-    PARAM_ANALYZER =            "analyzer",
-    PARAM_HOSTNAME =            "hostname",
-    PARAM_TOPTESTFILE =         "toptestfile",
-    PARAM_RUNMODIFIER =         "runmodifier",
-  
-    PARAM_HEAD_CHKSUM =         "checksum",
-    PARAM_HEAD_RESULTCOUNT =    "resultcount",
-    PARAM_HEAD_EXECACCOUNT =    "execaccount",
-    PARAM_HEAD_EXECDATE =       "execdate",
-    PARAM_HEAD_IMPORTERNAME =   "importername",
-    PARAM_HEAD_HARNESSTYPE =    "harnesstype",
-    PARAM_HEAD_IMPORTINFO =     "importinfo",
-    PARAM_HEAD_TESTRUNTYPE =    "testruntype",
-
-    TEST_RESULT_ELEMENT =       "test-result",
-    
-    TEST_REPLICATION_ELEMENT =  "test-replication",
-    INFO_ELEMENT =              "info",
-    COMMAND_LINE_ELEMENT =      "command-line",
-    WIN_ELEMENT =               "win",
-    UNIX_ELEMENT =              "unix",
-
-    PARAM_RESULT_EXECTIME =     "exectime",
-    PARAM_RESULT_RESULT =       "result",
-    PARAM_RESULT_RESULTINFO =   "resultinfo",
-    PARAM_RESULT_ISDONE =       "isdone",
-    PARAM_RESULT_LOGICAL_NAME = "logicalname",
-    PARAM_RESULT_DURATION =     "duration",
-    PARAM_RESULT_REVIEWSTATE =  "reviewstate",
-    PARAM_RESULT_CRLIST =       "crlist",
-
-    TEST_CASE_ELEMENT =         "test-case",
-
-    PARAM_TEST_CASE_NAME =      "testcasename",
-    PARAM_TEST_UNIT =           "testunit",
-    PARAM_TEST_PATH =           "testpath",
-
-    ENVIRONMENT_ELEMENT =       "environment",
-    ENV_ATT_ELEMENT =           "env-attribute",
-
-    TEST_PARAMETERS_ELEMENT =   "test-parameters",
-    EXECUTION_OUTPUT_ELEMENT =  "execution-output",
-    PARAM_OUTPUT_ERRORNAME =    "errorname",
-    
-    OUTPUT_DETAILS_ELEMENT =    "output-details",
-   
-    OUTPUT_FILES_ELEMENT =      "output-files", 
-    PARAM_OUTPUT_FILETYPE =     "filetype",
-    PARAM_OUTPUT_URL =          "url",
-
-    REVIEWER_COMMENTS_ELEMENT =  "reviewer-comments",
-
-    OLD_GTLF_ENV_PREFIX = "env.",
-    GTLF_ENV_PREFIX = "log.gtlf.env.",
-    
-    FAILURE_VALUE = "FAILURE",
-    SUCCESS_VALUE = "SUCCESS",
-    SKIP_VALUE = "SKIP",
-    SCRATCH_VALUE = "SCRATCH",
-    ABORT_VALUE = "ABORT";
-}
+package org.apache.beehive.test.tools.tch.util.gtlf;
+
+public interface GTLFConstants {
+
+  public static final String 
+
+    PARAM_NAME =                "name",
+    PARAM_VALUE =               "value",
+
+    TEST_LOG_ELEMENT =          "test-log",
+    HEADER_INFO_ELEMENT =       "header-info",
+
+    PARAM_RUNID =               "runid",
+    PARAM_TESTTYPE =            "testtype",
+    PARAM_CHANGE_NO =           "changenumber",
+    PARAM_RELEASE =             "release",
+    PARAM_LOAD =                "load",
+    PARAM_BRANCH =              "branch",
+    PARAM_PHASE =               "string",
+    PARAM_ANALYZER =            "analyzer",
+    PARAM_HOSTNAME =            "hostname",
+    PARAM_TOPTESTFILE =         "toptestfile",
+    PARAM_RUNMODIFIER =         "runmodifier",
+  
+    PARAM_HEAD_CHKSUM =         "checksum",
+    PARAM_HEAD_RESULTCOUNT =    "resultcount",
+    PARAM_HEAD_EXECACCOUNT =    "execaccount",
+    PARAM_HEAD_EXECDATE =       "execdate",
+    PARAM_HEAD_IMPORTERNAME =   "importername",
+    PARAM_HEAD_HARNESSTYPE =    "harnesstype",
+    PARAM_HEAD_IMPORTINFO =     "importinfo",
+    PARAM_HEAD_TESTRUNTYPE =    "testruntype",
+
+    TEST_RESULT_ELEMENT =       "test-result",
+    
+    TEST_REPLICATION_ELEMENT =  "test-replication",
+    INFO_ELEMENT =              "info",
+    COMMAND_LINE_ELEMENT =      "command-line",
+    WIN_ELEMENT =               "win",
+    UNIX_ELEMENT =              "unix",
+
+    PARAM_RESULT_EXECTIME =     "exectime",
+    PARAM_RESULT_RESULT =       "result",
+    PARAM_RESULT_RESULTINFO =   "resultinfo",
+    PARAM_RESULT_ISDONE =       "isdone",
+    PARAM_RESULT_LOGICAL_NAME = "logicalname",
+    PARAM_RESULT_DURATION =     "duration",
+    PARAM_RESULT_REVIEWSTATE =  "reviewstate",
+    PARAM_RESULT_CRLIST =       "crlist",
+
+    TEST_CASE_ELEMENT =         "test-case",
+
+    PARAM_TEST_CASE_NAME =      "testcasename",
+    PARAM_TEST_UNIT =           "testunit",
+    PARAM_TEST_PATH =           "testpath",
+
+    ENVIRONMENT_ELEMENT =       "environment",
+    ENV_ATT_ELEMENT =           "env-attribute",
+
+    TEST_PARAMETERS_ELEMENT =   "test-parameters",
+    EXECUTION_OUTPUT_ELEMENT =  "execution-output",
+    PARAM_OUTPUT_ERRORNAME =    "errorname",
+    
+    OUTPUT_DETAILS_ELEMENT =    "output-details",
+   
+    OUTPUT_FILES_ELEMENT =      "output-files", 
+    PARAM_OUTPUT_FILETYPE =     "filetype",
+    PARAM_OUTPUT_URL =          "url",
+
+    REVIEWER_COMMENTS_ELEMENT =  "reviewer-comments",
+
+    OLD_GTLF_ENV_PREFIX = "env.",
+    GTLF_ENV_PREFIX = "log.gtlf.env.",
+    
+    FAILURE_VALUE = "FAILURE",
+    SUCCESS_VALUE = "SUCCESS",
+    SKIP_VALUE = "SKIP",
+    SCRATCH_VALUE = "SCRATCH",
+    ABORT_VALUE = "ABORT";
+}

Propchange: beehive/trunk/controls/test/tools/tch/src/java/org/apache/beehive/test/tools/tch/util/gtlf/GTLFConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native