svn commit: r883384 [22/47] - in /incubator/kato/trunk/org.apache.kato: ./ kato.anttasks/src/main/java/org/apache/kato/anttasks/ kato.anttasks/src/main/java/org/apache/kato/anttasks/sitebuilder/ kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/...

[mo...@apache.org]

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/MapCollector.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/MapCollector.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/MapCollector.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/MapCollector.java Mon Nov 23 15:53:48 2009
@@ -1,152 +1,152 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.kato.tck.api.TCKException;
-
-
-public class MapCollector {
-
-	private Map variables=new TreeMap();
-
-	/**
-	 * Create collector with provided  initial values
-	 * 
-	 * @param environmentalVariables
-	 */
-	public MapCollector(List environmentalVariables) {
-		Iterator i=environmentalVariables.iterator();
-		while(i.hasNext()) {
-			String value=(String) i.next();
-			collect(value,null);
-		}
-	}
-	public MapCollector() {
-		
-	}
-
-
-	/**
-	 * Collects  variable key/value settings 
-	 * 
-	 * If a method registers a conflicting requirement
-	 * a TCK exception is thrown.
-	 *  
-	 * @param var - variable to record  (assumes that key and value are 
-	 *              seperated by an '='
-	 * @param method - method doing the recording
-	 * 
-	 */
-	public void collect(String var, Method method) {
-
-		
-		String key=null;
-		String value=null;
-		
-		String[] separateVar=splitEnvVar(var);
-		
-		
-		collect(separateVar[0],separateVar[1],method);
-
-
-	}
-
-	public static String[] splitEnvVar(String var) {
-		
-		String key=null;
-		String value=null;
-		int eq=var.indexOf('=');
-
-		if(eq<0) {
-			key=var;
-		}
-		else {
-			key=var.substring(0,eq);
-			value=var.substring(eq+1);
-			
-		}
-		return new String[]{key,value};
-
-	}
-	public void collect(String key, String value, Method method) {
-
-		if(variables.containsKey(key)==false) {
-			CollectionValue v=new CollectionValue();
-			v.recorder=method;
-			v.value=value;
-			variables.put(key,v);
-		}
-		else {
-			// key clash
-			CollectionValue original=(CollectionValue) variables.get(key);
-
-			if(original.value==null) {
-				if( value==null) return;  // matching ultimate value (both null)
-			}
-			else {
-				if( value!=null) {
-					// both not null.  same value?
-					if(original.equals(value)) return; // same value
-				}
-			}
-
-			String originator="<intial setup>";
-			if(original.recorder!=null) originator=original.recorder.toString();
-			throw new TCKException("unable to register key "+key+" for "+method+" value conflicts with previously registered value from "+originator);
-		}
-	}
-
-	class CollectionValue {
-		Method recorder=null;
-		String value=null;
-	}
-
-	public List asList() {
-
-		List list=new LinkedList();
-		Iterator i=variables.keySet().iterator();
-		while(i.hasNext()) {
-			Object key=i.next();
-			CollectionValue value=(CollectionValue) variables.get(key);
-			String keyValue=key.toString();
-			if(value.value==null) list.add(keyValue);
-			else list.add(keyValue+"="+value.value);
-		}
-
-		return list;
-	}
-
-	public Iterator keyIterator() {
-		return variables.keySet().iterator();
-	}
-
-	public String getValue(String key) {
-		CollectionValue value=(CollectionValue) variables.get(key);
-		if(value==null)  return null;
-		return value.value;
-	}
-
-	public int size() {
-		return variables.size();
-	}
-
-	
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.kato.tck.api.TCKException;
+
+
+public class MapCollector {
+
+	private Map variables=new TreeMap();
+
+	/**
+	 * Create collector with provided  initial values
+	 * 
+	 * @param environmentalVariables
+	 */
+	public MapCollector(List environmentalVariables) {
+		Iterator i=environmentalVariables.iterator();
+		while(i.hasNext()) {
+			String value=(String) i.next();
+			collect(value,null);
+		}
+	}
+	public MapCollector() {
+		
+	}
+
+
+	/**
+	 * Collects  variable key/value settings 
+	 * 
+	 * If a method registers a conflicting requirement
+	 * a TCK exception is thrown.
+	 *  
+	 * @param var - variable to record  (assumes that key and value are 
+	 *              seperated by an '='
+	 * @param method - method doing the recording
+	 * 
+	 */
+	public void collect(String var, Method method) {
+
+		
+		String key=null;
+		String value=null;
+		
+		String[] separateVar=splitEnvVar(var);
+		
+		
+		collect(separateVar[0],separateVar[1],method);
+
+
+	}
+
+	public static String[] splitEnvVar(String var) {
+		
+		String key=null;
+		String value=null;
+		int eq=var.indexOf('=');
+
+		if(eq<0) {
+			key=var;
+		}
+		else {
+			key=var.substring(0,eq);
+			value=var.substring(eq+1);
+			
+		}
+		return new String[]{key,value};
+
+	}
+	public void collect(String key, String value, Method method) {
+
+		if(variables.containsKey(key)==false) {
+			CollectionValue v=new CollectionValue();
+			v.recorder=method;
+			v.value=value;
+			variables.put(key,v);
+		}
+		else {
+			// key clash
+			CollectionValue original=(CollectionValue) variables.get(key);
+
+			if(original.value==null) {
+				if( value==null) return;  // matching ultimate value (both null)
+			}
+			else {
+				if( value!=null) {
+					// both not null.  same value?
+					if(original.equals(value)) return; // same value
+				}
+			}
+
+			String originator="<intial setup>";
+			if(original.recorder!=null) originator=original.recorder.toString();
+			throw new TCKException("unable to register key "+key+" for "+method+" value conflicts with previously registered value from "+originator);
+		}
+	}
+
+	class CollectionValue {
+		Method recorder=null;
+		String value=null;
+	}
+
+	public List asList() {
+
+		List list=new LinkedList();
+		Iterator i=variables.keySet().iterator();
+		while(i.hasNext()) {
+			Object key=i.next();
+			CollectionValue value=(CollectionValue) variables.get(key);
+			String keyValue=key.toString();
+			if(value.value==null) list.add(keyValue);
+			else list.add(keyValue+"="+value.value);
+		}
+
+		return list;
+	}
+
+	public Iterator keyIterator() {
+		return variables.keySet().iterator();
+	}
+
+	public String getValue(String key) {
+		CollectionValue value=(CollectionValue) variables.get(key);
+		if(value==null)  return null;
+		return value.value;
+	}
+
+	public int size() {
+		return variables.size();
+	}
+
+	
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/MapCollector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ProcessLauncher.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ProcessLauncher.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ProcessLauncher.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ProcessLauncher.java Mon Nov 23 15:53:48 2009
@@ -1,150 +1,150 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.LinkedList;
-import java.util.List;
-
-public class ProcessLauncher {
-
-	private List standardEnvVars = new LinkedList();
-	private String suffix = "";
-	private TCKReporter reporter=null;
-	
-	public ProcessLauncher() {
-		reporter=new TCKReporter();
-	}
-	public ProcessLauncher(TCKReporter reporter) {
-		this.reporter=reporter;
-	}
-	public int launch(File workingDir, List envvars, List list)
-			throws IOException {
-
-		List myEnvars = new LinkedList();
-		myEnvars.addAll(standardEnvVars);
-		myEnvars.addAll(envvars);
-
-		int size = list.size();
-		String[] parms = (String[]) list.toArray(new String[size]);
-		String[] vars = (String[]) myEnvars
-				.toArray(new String[myEnvars.size()]);
-
-		return launch(workingDir, vars, parms, null);
-	}
-
-	public int launch(File workingDir, String[] parms) throws IOException {
-		List myEnvars = new LinkedList();
-		myEnvars.addAll(standardEnvVars);
-		String[] vars = (String[]) myEnvars
-				.toArray(new String[myEnvars.size()]);
-		return launch(workingDir, vars, parms, null);
-	}
-
-	private int launch(File workingDir, String[] vars, String[] parms,
-			File output) throws IOException {
-
-		// TODO - should make configurable
-
-		for (int i = 0; i < parms.length; i++) {
-			reporter.report(suffix+" init parm " + i + " =" + parms[i]);
-		}
-		for (int i = 0; i < vars.length; i++) {
-			reporter.report(suffix+" init vars " + i + " =" + vars[i]);
-		}
-		Runtime r = Runtime.getRuntime();
-
-		Process p;
-
-		// if the env var list is empty we chuck it away so that envs are
-		// inheritied
-		if (vars != null && vars.length == 0) {
-			vars = null;
-		}
-		p = r.exec(parms, vars, workingDir);
-
-		PrintStream out = null;
-		PrintStream err = null;
-		FileOutputStream fos = null;
-
-		TextStreamRedirector rdr1=null;
-		TextStreamRedirector rdr2=null;
-		InputStream stdIn=p.getInputStream();
-		InputStream  errIn=p.getErrorStream();
-		
-		if (output != null) {
-
-			fos = new FileOutputStream(output);
-			PrintStream ps = new PrintStream(fos);
-			rdr1 = new TextStreamRedirector(stdIn,ps);
-	 	    rdr2 = new TextStreamRedirector(errIn,ps);
-					
-		   
-		} else {
-			// no specific file set. 
-			// if we have an reporter we can use it 
-			if(reporter!=null) {
-				rdr1 = new TextStreamRedirector(stdIn,reporter);
-		 	    rdr2 = new TextStreamRedirector(errIn,reporter);
-			}	
-			else {
-			rdr1 = new TextStreamRedirector(stdIn,System.out);
-	 	    rdr2 = new TextStreamRedirector(errIn,System.err);
-			}
-		}
-
-	   
-		rdr1.setPrefix(suffix);
-		rdr2.setPrefix(suffix);
-		rdr1.start();
-		rdr2.start();
-
-		try {
-			p.waitFor();
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		if (fos != null)
-			fos.close();
-
-		return p.exitValue();
-
-	}
-
-	public void launch(File workingDir, List list) throws IOException {
-		launch(workingDir, new LinkedList(), list);
-
-	}
-
-	public String getSuffix() {
-		return suffix;
-	}
-
-	public void setSuffix(String suffix) {
-		this.suffix = suffix;
-	}
-
-	public void launch(File workingDir, List list, File results)
-			throws IOException {
-		launch(workingDir, new String[0], (String[]) list
-				.toArray(new String[list.size()]), results);
-
-	}
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.LinkedList;
+import java.util.List;
+
+public class ProcessLauncher {
+
+	private List standardEnvVars = new LinkedList();
+	private String suffix = "";
+	private TCKReporter reporter=null;
+	
+	public ProcessLauncher() {
+		reporter=new TCKReporter();
+	}
+	public ProcessLauncher(TCKReporter reporter) {
+		this.reporter=reporter;
+	}
+	public int launch(File workingDir, List envvars, List list)
+			throws IOException {
+
+		List myEnvars = new LinkedList();
+		myEnvars.addAll(standardEnvVars);
+		myEnvars.addAll(envvars);
+
+		int size = list.size();
+		String[] parms = (String[]) list.toArray(new String[size]);
+		String[] vars = (String[]) myEnvars
+				.toArray(new String[myEnvars.size()]);
+
+		return launch(workingDir, vars, parms, null);
+	}
+
+	public int launch(File workingDir, String[] parms) throws IOException {
+		List myEnvars = new LinkedList();
+		myEnvars.addAll(standardEnvVars);
+		String[] vars = (String[]) myEnvars
+				.toArray(new String[myEnvars.size()]);
+		return launch(workingDir, vars, parms, null);
+	}
+
+	private int launch(File workingDir, String[] vars, String[] parms,
+			File output) throws IOException {
+
+		// TODO - should make configurable
+
+		for (int i = 0; i < parms.length; i++) {
+			reporter.report(suffix+" init parm " + i + " =" + parms[i]);
+		}
+		for (int i = 0; i < vars.length; i++) {
+			reporter.report(suffix+" init vars " + i + " =" + vars[i]);
+		}
+		Runtime r = Runtime.getRuntime();
+
+		Process p;
+
+		// if the env var list is empty we chuck it away so that envs are
+		// inheritied
+		if (vars != null && vars.length == 0) {
+			vars = null;
+		}
+		p = r.exec(parms, vars, workingDir);
+
+		PrintStream out = null;
+		PrintStream err = null;
+		FileOutputStream fos = null;
+
+		TextStreamRedirector rdr1=null;
+		TextStreamRedirector rdr2=null;
+		InputStream stdIn=p.getInputStream();
+		InputStream  errIn=p.getErrorStream();
+		
+		if (output != null) {
+
+			fos = new FileOutputStream(output);
+			PrintStream ps = new PrintStream(fos);
+			rdr1 = new TextStreamRedirector(stdIn,ps);
+	 	    rdr2 = new TextStreamRedirector(errIn,ps);
+					
+		   
+		} else {
+			// no specific file set. 
+			// if we have an reporter we can use it 
+			if(reporter!=null) {
+				rdr1 = new TextStreamRedirector(stdIn,reporter);
+		 	    rdr2 = new TextStreamRedirector(errIn,reporter);
+			}	
+			else {
+			rdr1 = new TextStreamRedirector(stdIn,System.out);
+	 	    rdr2 = new TextStreamRedirector(errIn,System.err);
+			}
+		}
+
+	   
+		rdr1.setPrefix(suffix);
+		rdr2.setPrefix(suffix);
+		rdr1.start();
+		rdr2.start();
+
+		try {
+			p.waitFor();
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		if (fos != null)
+			fos.close();
+
+		return p.exitValue();
+
+	}
+
+	public void launch(File workingDir, List list) throws IOException {
+		launch(workingDir, new LinkedList(), list);
+
+	}
+
+	public String getSuffix() {
+		return suffix;
+	}
+
+	public void setSuffix(String suffix) {
+		this.suffix = suffix;
+	}
+
+	public void launch(File workingDir, List list, File results)
+			throws IOException {
+		launch(workingDir, new String[0], (String[]) list
+				.toArray(new String[list.size()]), results);
+
+	}
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ProcessLauncher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/PropertyStoreXMLWriter.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/PropertyStoreXMLWriter.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/PropertyStoreXMLWriter.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/PropertyStoreXMLWriter.java Mon Nov 23 15:53:48 2009
@@ -1,88 +1,88 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-import java.util.Iterator;
-
-import org.apache.kato.tck.api.PropertyStore;
-
-
-public class PropertyStoreXMLWriter {
-
-	
-	private PropertyStore store=null;
-	
-	public PropertyStoreXMLWriter(PropertyStore store) {
-		this.store=store;
-	}
-	
-	/**
-	 * Writes the contents of the store to a properties file keys with null
-	 * values are written with blank values
-	 * 
-	 * @param store
-	 * @param outfile
-	 * @throws IOException
-	 */
-	public  void write(File outfile)
-			throws IOException {
-	
-		FileWriter fw = new FileWriter(outfile);
-		PrintWriter pw = new PrintWriter(fw);
-		
-		pw.println("<tckconfig created=\"" + new Date()+"\">");
-		
-		PropertyStore s=store;
-		while(s!=null) {
-			writeStoreConfig(s,pw);
-			s=s.getParent();
-		}
-				
-		pw.println("</tckconfig>");
-		pw.close();
-	
-	}
-
-	private void writeStoreConfig(PropertyStore pstore,PrintWriter pw) {
-		
-		pw.println("<store source=\""+pstore.getSource()+"\">");
-		
-		Iterator keyIterator = pstore.iterator();
-		
-		while (keyIterator.hasNext()) {
-			String key = (String) keyIterator.next();
-			pw.print("<key name=\""+key+"\" ");
-			
-			String resolvedValue = store.getProperty(key);
-			String value=pstore.getPropertyAsIs(key);
-			if(value!=null) {
-				pw.print("value=\""+value+"\" " );
-			}
-			
-			if(resolvedValue!=null) {
-				pw.print("resolvedvalue=\""+resolvedValue+"\" " );
-			}
-	
-			pw.println(" />");
-			
-		}
-		pw.println("</store>");
-	}
-
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+import java.util.Iterator;
+
+import org.apache.kato.tck.api.PropertyStore;
+
+
+public class PropertyStoreXMLWriter {
+
+	
+	private PropertyStore store=null;
+	
+	public PropertyStoreXMLWriter(PropertyStore store) {
+		this.store=store;
+	}
+	
+	/**
+	 * Writes the contents of the store to a properties file keys with null
+	 * values are written with blank values
+	 * 
+	 * @param store
+	 * @param outfile
+	 * @throws IOException
+	 */
+	public  void write(File outfile)
+			throws IOException {
+	
+		FileWriter fw = new FileWriter(outfile);
+		PrintWriter pw = new PrintWriter(fw);
+		
+		pw.println("<tckconfig created=\"" + new Date()+"\">");
+		
+		PropertyStore s=store;
+		while(s!=null) {
+			writeStoreConfig(s,pw);
+			s=s.getParent();
+		}
+				
+		pw.println("</tckconfig>");
+		pw.close();
+	
+	}
+
+	private void writeStoreConfig(PropertyStore pstore,PrintWriter pw) {
+		
+		pw.println("<store source=\""+pstore.getSource()+"\">");
+		
+		Iterator keyIterator = pstore.iterator();
+		
+		while (keyIterator.hasNext()) {
+			String key = (String) keyIterator.next();
+			pw.print("<key name=\""+key+"\" ");
+			
+			String resolvedValue = store.getProperty(key);
+			String value=pstore.getPropertyAsIs(key);
+			if(value!=null) {
+				pw.print("value=\""+value+"\" " );
+			}
+			
+			if(resolvedValue!=null) {
+				pw.print("resolvedvalue=\""+resolvedValue+"\" " );
+			}
+	
+			pw.println(" />");
+			
+		}
+		pw.println("</store>");
+	}
+
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/PropertyStoreXMLWriter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java Mon Nov 23 15:53:48 2009
@@ -1,283 +1,283 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.tools.diagnostics.FactoryRegistry;
-import javax.tools.diagnostics.image.CorruptData;
-import javax.tools.diagnostics.image.CorruptDataException;
-import javax.tools.diagnostics.runtime.java.JavaClass;
-import javax.tools.diagnostics.runtime.java.JavaClassLoader;
-import javax.tools.diagnostics.runtime.java.JavaField;
-import javax.tools.diagnostics.runtime.java.JavaHeap;
-import javax.tools.diagnostics.runtime.java.JavaObject;
-import javax.tools.diagnostics.runtime.java.JavaRuntime;
-
-import org.apache.kato.tck.api.IJavaRuntimeCreator;
-
-
-public abstract class TCKJavaRuntimeTestcase extends AbstractTCKTestcase {
-
-	/**
-	 * 
-	 */
-	private static final String DUMPPATH_PROPERTY = "org.apache.kato.dumppath";
-	private static JavaRuntime runtime=null;
-	private static IJavaRuntimeCreator creator=null;
-
-	
-	/**
-	 * Convert an address to a 0x hex number
-	 * @param address
-	 * @return A string representing the address
-	 */
-	public static String format(long address) {
-		return "0x"+Long.toHexString(address);
-	}
-
-	/**
-	 * Retrieves a field from a JavaClass by name.
-	 * 
-	 * @param javaClass JavaClass to get field from
-	 * @param fieldName name of field to retrieve.
-	 * @return JavaField found, or null if not found.
-	 * @throws CorruptDataException
-	 */
-	public static JavaField getJavaField(JavaClass javaClass, String fieldName)
-			throws CorruptDataException {
-				JavaField foundField = null;
-				
-                Iterator fields = javaClass.getDeclaredFields().iterator();
-
-                while (fields.hasNext()) {
-                    JavaField nextField = (JavaField) fields.next();
-										
-					if (nextField.getName().equals(fieldName)) {
-						foundField = nextField;
-						break;
-					}
-				}
-				
-				return foundField;
-			}
-
-	/**
-	 * Retrieve a JavaField by name from a JavaObject.
-	 * You must use the JavaField on the passed JavaObject
-	 * to get the actual field contents though.
-	 * 
-	 * @param javaObject JavaObject to retrieve the JavaField from.
-	 * @param fieldName The name of the JavaField to retrieve
-	 * @return JavaField or null if not found.
-	 * @throws CorruptDataException
-	 */
-	public static JavaField getJavaField(JavaObject javaObject, String fieldName)
-			throws CorruptDataException {
-				return getJavaField(javaObject.getJavaClass(), fieldName);
-			}
-
-	public JavaRuntime getJavaRuntime()
-	{
-		if(runtime==null) {
-			String dumpFileNamePath=System.getProperty(DUMPPATH_PROPERTY);
-			if(dumpFileNamePath==null) report("Missing dump path. Set System Property "+DUMPPATH_PROPERTY+" to full path to the dump");
-			
-			try {
-				File dump=new File(dumpFileNamePath);
-				runtime=FactoryRegistry.getDefaultRegistry().getJavaRuntime(dump);
-				
-			} catch (IOException e) {
-				report(e,"unable to create Java runtime image from dump "+dumpFileNamePath);
-			}
-			if(runtime==null) report("unable to create Java runtime image from dump "+dumpFileNamePath);
-		}
-		return runtime;
-	}
-
-	
-
-	/**
-	 * Returns the system classloader for runtime.
-	 * @return the JavaClassLoader object representing the system classloader.
-	 */
-	
-	protected JavaClassLoader getBootClassLoader() {
-	
-		JavaRuntime run = getJavaRuntime();
-		
-		// Find the bootstrap loader using the idea that it it the only loader to have loaded itself
-		JavaClassLoader bootLoader = null;
-		HashMap loaders = new HashMap();
-		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
-			Object next = i.next();
-			if (next instanceof CorruptData) {
-				continue;
-			}
-			JavaClassLoader jcl = (JavaClassLoader)next;
-			try {
-				JavaObject loaderObject = jcl.getObject();
-				// Remember the class loader
-				loaders.put(loaderObject, jcl);
-				if (loaderObject == null) {
-					// Potential boot loader
-					System.out.println("Found class loader with null Java object "+jcl);
-					bootLoader = jcl;
-					break;
-				} else if (loaderObject.getJavaClass().getName().equals("*System*")) {
-					System.out.println("Found class loader of type *System* "+jcl);
-					bootLoader = jcl;
-					break;
-				} else {
-					JavaClass loadObjectClass = loaderObject.getJavaClass();
-					System.out.println("Found class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
-					JavaClassLoader jcl2 = getClassLoader(loadObjectClass);
-					if (jcl.equals(jcl2)) {
-						System.out.println("Found boot class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
-						bootLoader = jcl;
-						break;
-					}
-				}
-			} catch (CorruptDataException e) {
-			}
-		}
-		return bootLoader;
-	
-	}
-
-	/**
-	 * Basic class loader finder - copes with arrays not having a loader, use component type loader instead
-	 * @param j2
-	 * @param listener TODO
-	 * 
-	 * @throws CorruptDataException
-	 */
-	private JavaClassLoader getClassLoader1(JavaClass j2) throws CorruptDataException {
-		JavaClassLoader load;
-		// Fix up possible problem with arrays not having a class loader
-		// Use the loader of the component type instead
-		for (JavaClass j3 = j2; ; j3 = j3.getComponentType()) {
-			load = j3.getClassLoader();
-			if (load != null) break;
-		}
-		return load;
-	}
-
-	/**
-	 * General class loader finder
-	 * @param j1
-	 * @param listener TODO
-	 * 
-	 * @throws CorruptDataException
-	 */
-	private JavaClassLoader getClassLoader(JavaClass j1) throws CorruptDataException {
-		try {
-			return getClassLoader1(j1);
-		} catch (CorruptDataException e) {
-			JavaClassLoader load = getClassLoader2(j1);
-			if (load != null) return load;
-			throw e;
-		}
-	}
-
-	/**
-	 * @param j1
-	 * 
-	 * @throws CorruptDataException
-	 */
-	private JavaClassLoader getClassLoader2(JavaClass j1) throws CorruptDataException {		
-		JavaClassLoader load = null;
-		JavaRuntime run = getJavaRuntime();
-		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
-			Object next = i.next();
-			if (next instanceof CorruptData) {
-				continue;
-			}
-			JavaClassLoader jcl = (JavaClassLoader)next;
-			for (Iterator j = jcl.getDefinedClasses().iterator();j.hasNext();) {
-				Object next2 = j.next();
-				if (next2 instanceof CorruptData) {
-					continue;
-				}
-				JavaClass j2 = (JavaClass)next2;
-				if (j2.equals(j1)) {
-					return jcl;
-				}
-			}
-		}
-		return load;
-	}
-
-	
-	private JavaObject thisJavaObject = null;
-	/**
-	 * Finds the JavaObject in the  Dump that corresponds with this
-	 * testcase.
-	 *  
-	 * @return The dead version of the test, or null.
-	 */
-	public JavaObject getScenerioReference()  {
-		
-		
-		String packageName=this.getClass().getPackage().getName();
-		String thisClassName=this.getClass().getSimpleName();
-		String testClassName="Setup"+thisClassName.substring(4);
-		
-		String scenerioReference=packageName+"."+testClassName;
-		scenerioReference=scenerioReference.replace('.', '/');
-		
-		
-		if (thisJavaObject == null) {
-			return thisJavaObject = getJavaObjectByClassname(scenerioReference);
-		}
-		
-		return null;
-	}
-	
-	public JavaObject getJavaObjectByClassname(String className) {
-		JavaRuntime run = getJavaRuntime();
-		
-		for(Iterator heaps = run.getHeaps().iterator(); heaps.hasNext();) {
-			Object nextHeap = heaps.next(); 
-			
-			if (nextHeap instanceof CorruptData) {
-				continue;
-			}
-			
-			JavaHeap heap = (JavaHeap) nextHeap;
-			
-			for(Iterator objects = heap.getObjects().iterator(); objects.hasNext();) {
-				Object nextObject = objects.next();
-				
-				if (nextObject instanceof CorruptData) {
-					continue;					
-				}
-				
-				JavaObject object = (JavaObject) nextObject;
-				
-				try {
-					if (className.equals(object.getJavaClass().getName())) {
-						return object;
-					}
-				} catch (CorruptDataException e) {
-					// Ignore, it might be a following object.
-				}
-			}			
-		}
-		return null;
-	}
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import javax.tools.diagnostics.FactoryRegistry;
+import javax.tools.diagnostics.image.CorruptData;
+import javax.tools.diagnostics.image.CorruptDataException;
+import javax.tools.diagnostics.runtime.java.JavaClass;
+import javax.tools.diagnostics.runtime.java.JavaClassLoader;
+import javax.tools.diagnostics.runtime.java.JavaField;
+import javax.tools.diagnostics.runtime.java.JavaHeap;
+import javax.tools.diagnostics.runtime.java.JavaObject;
+import javax.tools.diagnostics.runtime.java.JavaRuntime;
+
+import org.apache.kato.tck.api.IJavaRuntimeCreator;
+
+
+public abstract class TCKJavaRuntimeTestcase extends AbstractTCKTestcase {
+
+	/**
+	 * 
+	 */
+	private static final String DUMPPATH_PROPERTY = "org.apache.kato.dumppath";
+	private static JavaRuntime runtime=null;
+	private static IJavaRuntimeCreator creator=null;
+
+	
+	/**
+	 * Convert an address to a 0x hex number
+	 * @param address
+	 * @return A string representing the address
+	 */
+	public static String format(long address) {
+		return "0x"+Long.toHexString(address);
+	}
+
+	/**
+	 * Retrieves a field from a JavaClass by name.
+	 * 
+	 * @param javaClass JavaClass to get field from
+	 * @param fieldName name of field to retrieve.
+	 * @return JavaField found, or null if not found.
+	 * @throws CorruptDataException
+	 */
+	public static JavaField getJavaField(JavaClass javaClass, String fieldName)
+			throws CorruptDataException {
+				JavaField foundField = null;
+				
+                Iterator fields = javaClass.getDeclaredFields().iterator();
+
+                while (fields.hasNext()) {
+                    JavaField nextField = (JavaField) fields.next();
+										
+					if (nextField.getName().equals(fieldName)) {
+						foundField = nextField;
+						break;
+					}
+				}
+				
+				return foundField;
+			}
+
+	/**
+	 * Retrieve a JavaField by name from a JavaObject.
+	 * You must use the JavaField on the passed JavaObject
+	 * to get the actual field contents though.
+	 * 
+	 * @param javaObject JavaObject to retrieve the JavaField from.
+	 * @param fieldName The name of the JavaField to retrieve
+	 * @return JavaField or null if not found.
+	 * @throws CorruptDataException
+	 */
+	public static JavaField getJavaField(JavaObject javaObject, String fieldName)
+			throws CorruptDataException {
+				return getJavaField(javaObject.getJavaClass(), fieldName);
+			}
+
+	public JavaRuntime getJavaRuntime()
+	{
+		if(runtime==null) {
+			String dumpFileNamePath=System.getProperty(DUMPPATH_PROPERTY);
+			if(dumpFileNamePath==null) report("Missing dump path. Set System Property "+DUMPPATH_PROPERTY+" to full path to the dump");
+			
+			try {
+				File dump=new File(dumpFileNamePath);
+				runtime=FactoryRegistry.getDefaultRegistry().getJavaRuntime(dump);
+				
+			} catch (IOException e) {
+				report(e,"unable to create Java runtime image from dump "+dumpFileNamePath);
+			}
+			if(runtime==null) report("unable to create Java runtime image from dump "+dumpFileNamePath);
+		}
+		return runtime;
+	}
+
+	
+
+	/**
+	 * Returns the system classloader for runtime.
+	 * @return the JavaClassLoader object representing the system classloader.
+	 */
+	
+	protected JavaClassLoader getBootClassLoader() {
+	
+		JavaRuntime run = getJavaRuntime();
+		
+		// Find the bootstrap loader using the idea that it it the only loader to have loaded itself
+		JavaClassLoader bootLoader = null;
+		HashMap loaders = new HashMap();
+		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
+			Object next = i.next();
+			if (next instanceof CorruptData) {
+				continue;
+			}
+			JavaClassLoader jcl = (JavaClassLoader)next;
+			try {
+				JavaObject loaderObject = jcl.getObject();
+				// Remember the class loader
+				loaders.put(loaderObject, jcl);
+				if (loaderObject == null) {
+					// Potential boot loader
+					System.out.println("Found class loader with null Java object "+jcl);
+					bootLoader = jcl;
+					break;
+				} else if (loaderObject.getJavaClass().getName().equals("*System*")) {
+					System.out.println("Found class loader of type *System* "+jcl);
+					bootLoader = jcl;
+					break;
+				} else {
+					JavaClass loadObjectClass = loaderObject.getJavaClass();
+					System.out.println("Found class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
+					JavaClassLoader jcl2 = getClassLoader(loadObjectClass);
+					if (jcl.equals(jcl2)) {
+						System.out.println("Found boot class loader "+loadObjectClass.getName()+" at "+format(loaderObject.getID().getAddress()));
+						bootLoader = jcl;
+						break;
+					}
+				}
+			} catch (CorruptDataException e) {
+			}
+		}
+		return bootLoader;
+	
+	}
+
+	/**
+	 * Basic class loader finder - copes with arrays not having a loader, use component type loader instead
+	 * @param j2
+	 * @param listener TODO
+	 * 
+	 * @throws CorruptDataException
+	 */
+	private JavaClassLoader getClassLoader1(JavaClass j2) throws CorruptDataException {
+		JavaClassLoader load;
+		// Fix up possible problem with arrays not having a class loader
+		// Use the loader of the component type instead
+		for (JavaClass j3 = j2; ; j3 = j3.getComponentType()) {
+			load = j3.getClassLoader();
+			if (load != null) break;
+		}
+		return load;
+	}
+
+	/**
+	 * General class loader finder
+	 * @param j1
+	 * @param listener TODO
+	 * 
+	 * @throws CorruptDataException
+	 */
+	private JavaClassLoader getClassLoader(JavaClass j1) throws CorruptDataException {
+		try {
+			return getClassLoader1(j1);
+		} catch (CorruptDataException e) {
+			JavaClassLoader load = getClassLoader2(j1);
+			if (load != null) return load;
+			throw e;
+		}
+	}
+
+	/**
+	 * @param j1
+	 * 
+	 * @throws CorruptDataException
+	 */
+	private JavaClassLoader getClassLoader2(JavaClass j1) throws CorruptDataException {		
+		JavaClassLoader load = null;
+		JavaRuntime run = getJavaRuntime();
+		for (Iterator i = run.getJavaClassLoaders().iterator(); i.hasNext();) {
+			Object next = i.next();
+			if (next instanceof CorruptData) {
+				continue;
+			}
+			JavaClassLoader jcl = (JavaClassLoader)next;
+			for (Iterator j = jcl.getDefinedClasses().iterator();j.hasNext();) {
+				Object next2 = j.next();
+				if (next2 instanceof CorruptData) {
+					continue;
+				}
+				JavaClass j2 = (JavaClass)next2;
+				if (j2.equals(j1)) {
+					return jcl;
+				}
+			}
+		}
+		return load;
+	}
+
+	
+	private JavaObject thisJavaObject = null;
+	/**
+	 * Finds the JavaObject in the  Dump that corresponds with this
+	 * testcase.
+	 *  
+	 * @return The dead version of the test, or null.
+	 */
+	public JavaObject getScenerioReference()  {
+		
+		
+		String packageName=this.getClass().getPackage().getName();
+		String thisClassName=this.getClass().getSimpleName();
+		String testClassName="Setup"+thisClassName.substring(4);
+		
+		String scenerioReference=packageName+"."+testClassName;
+		scenerioReference=scenerioReference.replace('.', '/');
+		
+		
+		if (thisJavaObject == null) {
+			return thisJavaObject = getJavaObjectByClassname(scenerioReference);
+		}
+		
+		return null;
+	}
+	
+	public JavaObject getJavaObjectByClassname(String className) {
+		JavaRuntime run = getJavaRuntime();
+		
+		for(Iterator heaps = run.getHeaps().iterator(); heaps.hasNext();) {
+			Object nextHeap = heaps.next(); 
+			
+			if (nextHeap instanceof CorruptData) {
+				continue;
+			}
+			
+			JavaHeap heap = (JavaHeap) nextHeap;
+			
+			for(Iterator objects = heap.getObjects().iterator(); objects.hasNext();) {
+				Object nextObject = objects.next();
+				
+				if (nextObject instanceof CorruptData) {
+					continue;					
+				}
+				
+				JavaObject object = (JavaObject) nextObject;
+				
+				try {
+					if (className.equals(object.getJavaClass().getName())) {
+						return object;
+					}
+				} catch (CorruptDataException e) {
+					// Ignore, it might be a following object.
+				}
+			}			
+		}
+		return null;
+	}
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKJavaRuntimeTestcase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKLauncherConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKLauncherConfigurator.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKLauncherConfigurator.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKLauncherConfigurator.java Mon Nov 23 15:53:48 2009
@@ -1,176 +1,176 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.File;
-
-public class TCKLauncherConfigurator {
-	
-	private String[] args=null;
-	private String error=null;
-	private boolean runTests=true;
-	private boolean runDump=true;
-	private File testConfigFile = null;
-	private File outputLocation = null;
-	private File tckConfigFile=null;
-	
-	public TCKLauncherConfigurator(String[] args) {
-		this.args=args;
-	}
-	public String getErrorMessage() {
-		return error;
-	}
-	public boolean  isValid() {
-		
-		
-		if (args == null || args.length == 0) {
-			return false;
-		}
-		
-		Boolean dumponly=null;
-		Boolean testonly=null;
-		
-		
-		for (int i = 0; i < args.length; i++) {
-
-			String arg = args[i];
-			if (arg.equalsIgnoreCase("-testonly")) {
-				if(testonly!=null) {
-					error="-testonly can only be specified once";
-					return false;
-				}
-				testonly=new Boolean(true);
-			}
-			else if (arg.equalsIgnoreCase("-dumponly")) {
-				if(dumponly!=null) {
-					error="-dumponly can only be specified once";
-					return false;
-				}
-				dumponly=new Boolean(true);
-			}
-			else if (arg.equalsIgnoreCase("-tckconfig")) {
-				if (tckConfigFile != null) {
-					error="-tckconfig can only be specified once";
-					return false;
-				}
-				if ((i + 1) >= args.length) {
-					error="-tckconfig requires a filename";
-					return false;
-				}
-				i++;
-				String nextArg=args[i];
-				if(nextArg.startsWith("-")) {
-					error="-tckconfig requires a filename";
-					return false;
-				}
-				
-				tckConfigFile = new File(nextArg);
-				
-				if (tckConfigFile.exists()==false) {
-					error="testsuite file "+tckConfigFile.getAbsolutePath()+" does not exist";
-					return false;
-				}
-				
-				if (tckConfigFile.isDirectory()) {
-					error="TCK config file "+tckConfigFile.getAbsolutePath()+" is a directory";
-					return false;
-				}
-				
-			}
-			else if (arg.equalsIgnoreCase("-output")) { 
-				if (outputLocation != null) {
-					error="-output can only be specified once";
-					return false;
-				}
-				if ((i + 1) >= args.length) {
-					error="-output requires a filename";
-					return false;
-				}
-				i++;
-				String nextArg=args[i];
-				if(nextArg.startsWith("-")) {
-					error="-output requires a filename";
-					return false;
-				}
-				
-				outputLocation = new File(nextArg);
-				
-				if (outputLocation.exists() && outputLocation.isDirectory()) {
-					error="output location "
-							+ outputLocation.getAbsolutePath()
-							+ " is a directory";
-					return false;
-				}
-				
-			}
-			else if (arg.equalsIgnoreCase("-testconfig")) {
-				if (testConfigFile != null) {
-					error="-testconfig can only be specified once";
-					return false;
-				}
-				if ((i + 1) >= args.length) {
-					error="-testconfig requires a filename";
-					return false;
-				}
-				i++;
-				String nextArg=args[i];
-				if(nextArg.startsWith("-")) {
-					error="-testconfig requires a filename";
-					return false;
-				}
-				testConfigFile = new File(nextArg);
-				if (testConfigFile.exists() == false) {
-					error="testconfig file "
-							+ testConfigFile.getAbsolutePath()
-							+ " does not exist";
-					return false;
-				}
-				if (testConfigFile.isFile() == false) {
-					error="testconfig file "
-							+ testConfigFile.getAbsolutePath()
-							+ " is not a file";
-					return false;
-				}
-
-			} else {
-				error="argument " + arg + " is not understood";
-				
-				return false;
-			}
-		}
-		
-		if(testonly==null) testonly=new Boolean(false);
-		if(dumponly==null) dumponly=new Boolean(false);
-		
-		runTests=!dumponly.booleanValue();
-		runDump=!testonly.booleanValue();
-		
-		return true;
-	}
-	public File getTestConfigFile() {
-		return testConfigFile;
-	}
-	public File getOutputLocation() {
-		return outputLocation;
-	}
-	public boolean isRunTests() {
-		return runTests;
-	}
-	public boolean isRunDump() {
-		return runDump;
-	}
-	public File getTCKConfigFile() {
-		return tckConfigFile;
-	}
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.File;
+
+public class TCKLauncherConfigurator {
+	
+	private String[] args=null;
+	private String error=null;
+	private boolean runTests=true;
+	private boolean runDump=true;
+	private File testConfigFile = null;
+	private File outputLocation = null;
+	private File tckConfigFile=null;
+	
+	public TCKLauncherConfigurator(String[] args) {
+		this.args=args;
+	}
+	public String getErrorMessage() {
+		return error;
+	}
+	public boolean  isValid() {
+		
+		
+		if (args == null || args.length == 0) {
+			return false;
+		}
+		
+		Boolean dumponly=null;
+		Boolean testonly=null;
+		
+		
+		for (int i = 0; i < args.length; i++) {
+
+			String arg = args[i];
+			if (arg.equalsIgnoreCase("-testonly")) {
+				if(testonly!=null) {
+					error="-testonly can only be specified once";
+					return false;
+				}
+				testonly=new Boolean(true);
+			}
+			else if (arg.equalsIgnoreCase("-dumponly")) {
+				if(dumponly!=null) {
+					error="-dumponly can only be specified once";
+					return false;
+				}
+				dumponly=new Boolean(true);
+			}
+			else if (arg.equalsIgnoreCase("-tckconfig")) {
+				if (tckConfigFile != null) {
+					error="-tckconfig can only be specified once";
+					return false;
+				}
+				if ((i + 1) >= args.length) {
+					error="-tckconfig requires a filename";
+					return false;
+				}
+				i++;
+				String nextArg=args[i];
+				if(nextArg.startsWith("-")) {
+					error="-tckconfig requires a filename";
+					return false;
+				}
+				
+				tckConfigFile = new File(nextArg);
+				
+				if (tckConfigFile.exists()==false) {
+					error="testsuite file "+tckConfigFile.getAbsolutePath()+" does not exist";
+					return false;
+				}
+				
+				if (tckConfigFile.isDirectory()) {
+					error="TCK config file "+tckConfigFile.getAbsolutePath()+" is a directory";
+					return false;
+				}
+				
+			}
+			else if (arg.equalsIgnoreCase("-output")) { 
+				if (outputLocation != null) {
+					error="-output can only be specified once";
+					return false;
+				}
+				if ((i + 1) >= args.length) {
+					error="-output requires a filename";
+					return false;
+				}
+				i++;
+				String nextArg=args[i];
+				if(nextArg.startsWith("-")) {
+					error="-output requires a filename";
+					return false;
+				}
+				
+				outputLocation = new File(nextArg);
+				
+				if (outputLocation.exists() && outputLocation.isDirectory()) {
+					error="output location "
+							+ outputLocation.getAbsolutePath()
+							+ " is a directory";
+					return false;
+				}
+				
+			}
+			else if (arg.equalsIgnoreCase("-testconfig")) {
+				if (testConfigFile != null) {
+					error="-testconfig can only be specified once";
+					return false;
+				}
+				if ((i + 1) >= args.length) {
+					error="-testconfig requires a filename";
+					return false;
+				}
+				i++;
+				String nextArg=args[i];
+				if(nextArg.startsWith("-")) {
+					error="-testconfig requires a filename";
+					return false;
+				}
+				testConfigFile = new File(nextArg);
+				if (testConfigFile.exists() == false) {
+					error="testconfig file "
+							+ testConfigFile.getAbsolutePath()
+							+ " does not exist";
+					return false;
+				}
+				if (testConfigFile.isFile() == false) {
+					error="testconfig file "
+							+ testConfigFile.getAbsolutePath()
+							+ " is not a file";
+					return false;
+				}
+
+			} else {
+				error="argument " + arg + " is not understood";
+				
+				return false;
+			}
+		}
+		
+		if(testonly==null) testonly=new Boolean(false);
+		if(dumponly==null) dumponly=new Boolean(false);
+		
+		runTests=!dumponly.booleanValue();
+		runDump=!testonly.booleanValue();
+		
+		return true;
+	}
+	public File getTestConfigFile() {
+		return testConfigFile;
+	}
+	public File getOutputLocation() {
+		return outputLocation;
+	}
+	public boolean isRunTests() {
+		return runTests;
+	}
+	public boolean isRunDump() {
+		return runDump;
+	}
+	public File getTCKConfigFile() {
+		return tckConfigFile;
+	}
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKLauncherConfigurator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKProcessTestcase.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKProcessTestcase.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKProcessTestcase.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKProcessTestcase.java Mon Nov 23 15:53:48 2009
@@ -1,66 +1,66 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import javax.tools.diagnostics.image.Image;
-
-import org.apache.kato.tck.api.IImageCreator;
-
-
-public abstract class TCKProcessTestcase extends AbstractTCKTestcase{
-
-	private static Image image=null;
-	
-	private static IImageCreator imageCreator=null;
-	
-	protected Image getImage()
-	{
-		if(image==null) {	
-			IImageCreator creator=getImageCreator();
-			
-			try {
-				image=creator.createProcessImage();
-			} catch (Exception e) {
-				
-				report(e,"unable to create process image from dump");
-			}
-			if(image==null) report("unable to create process image from dump");
-		}
-		return image;
-	}
-	
-	private IImageCreator getImageCreator() 
-	{
-		
-	
-		if(imageCreator!=null) return imageCreator;
-
-		String className="fixme";
-	
-		Class clazz=null;
-		try {
-			clazz = Class.forName(className);
-		} catch (ClassNotFoundException e) {
-			report(e,"cannot locate Image generator class "+className);
-
-		}
-		try {
-			imageCreator=(IImageCreator) clazz.newInstance();
-		} catch (Exception e) {
-			report(e,"unable to instantiate Image creator class "+className);
-		}
-		return imageCreator;
-	}
-
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import javax.tools.diagnostics.image.Image;
+
+import org.apache.kato.tck.api.IImageCreator;
+
+
+public abstract class TCKProcessTestcase extends AbstractTCKTestcase{
+
+	private static Image image=null;
+	
+	private static IImageCreator imageCreator=null;
+	
+	protected Image getImage()
+	{
+		if(image==null) {	
+			IImageCreator creator=getImageCreator();
+			
+			try {
+				image=creator.createProcessImage();
+			} catch (Exception e) {
+				
+				report(e,"unable to create process image from dump");
+			}
+			if(image==null) report("unable to create process image from dump");
+		}
+		return image;
+	}
+	
+	private IImageCreator getImageCreator() 
+	{
+		
+	
+		if(imageCreator!=null) return imageCreator;
+
+		String className="fixme";
+	
+		Class clazz=null;
+		try {
+			clazz = Class.forName(className);
+		} catch (ClassNotFoundException e) {
+			report(e,"cannot locate Image generator class "+className);
+
+		}
+		try {
+			imageCreator=(IImageCreator) clazz.newInstance();
+		} catch (Exception e) {
+			report(e,"unable to instantiate Image creator class "+className);
+		}
+		return imageCreator;
+	}
+
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKProcessTestcase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKReporter.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKReporter.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKReporter.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKReporter.java Mon Nov 23 15:53:48 2009
@@ -1,50 +1,50 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-public class TCKReporter {
-
-	private PrintWriter out=null;
-	
-	public TCKReporter(PrintWriter out) {
-		this.out=out;
-	}
-	public TCKReporter(PrintStream out) {
-		this.out=new PrintWriter(out);
-	}
-	public TCKReporter() {
-		this(System.out);
-	}
-	public TCKReporter(File output) throws IOException {
-		FileWriter fw=new FileWriter(output);
-		this.out=new PrintWriter(fw);
-	}
-	public void report(String message) {
-		out.println(message);
-		out.flush();
-	}
-	public void report(String text, Throwable e) {
-		out.println(text);
-		out.flush();
-		e.printStackTrace(out);
-		
-	}
-
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+public class TCKReporter {
+
+	private PrintWriter out=null;
+	
+	public TCKReporter(PrintWriter out) {
+		this.out=out;
+	}
+	public TCKReporter(PrintStream out) {
+		this.out=new PrintWriter(out);
+	}
+	public TCKReporter() {
+		this(System.out);
+	}
+	public TCKReporter(File output) throws IOException {
+		FileWriter fw=new FileWriter(output);
+		this.out=new PrintWriter(fw);
+	}
+	public void report(String message) {
+		out.println(message);
+		out.flush();
+	}
+	public void report(String text, Throwable e) {
+		out.println(text);
+		out.flush();
+		e.printStackTrace(out);
+		
+	}
+
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TCKReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TextStreamRedirector.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TextStreamRedirector.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TextStreamRedirector.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TextStreamRedirector.java Mon Nov 23 15:53:48 2009
@@ -1,72 +1,72 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-
-public class TextStreamRedirector extends Thread {
-
-	private InputStream in = null;
-	private TCKReporter out = null;
-	private String prefix="";
-
-	public TextStreamRedirector(InputStream in, PrintStream out) {
-		this.in=in;
-		this.out=new TCKReporter(out);
-		
-	}
-	
-	public TextStreamRedirector(InputStream in, TCKReporter reporter) {
-		this.in=in;
-		this.out=reporter;
-		
-	}
-
-	public void run() {
-
-		InputStreamReader  isr=new  InputStreamReader(in);
-		BufferedReader br=new BufferedReader(isr);
-
-		while(true) {
-			try {
-				String data=br.readLine();
-				if(data==null) break;
-				out.report(prefix+data);
-			} catch(IOException e) {
-				e.printStackTrace();
-				break;
-			}
-		}
-
-		try {
-			br.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public String getPrefix() {
-		return prefix;
-	}
-
-	public void setPrefix(String prefix) {
-		this.prefix = prefix;
-	}
-}
-
-
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+
+public class TextStreamRedirector extends Thread {
+
+	private InputStream in = null;
+	private TCKReporter out = null;
+	private String prefix="";
+
+	public TextStreamRedirector(InputStream in, PrintStream out) {
+		this.in=in;
+		this.out=new TCKReporter(out);
+		
+	}
+	
+	public TextStreamRedirector(InputStream in, TCKReporter reporter) {
+		this.in=in;
+		this.out=reporter;
+		
+	}
+
+	public void run() {
+
+		InputStreamReader  isr=new  InputStreamReader(in);
+		BufferedReader br=new BufferedReader(isr);
+
+		while(true) {
+			try {
+				String data=br.readLine();
+				if(data==null) break;
+				out.report(prefix+data);
+			} catch(IOException e) {
+				e.printStackTrace();
+				break;
+			}
+		}
+
+		try {
+			br.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public String getPrefix() {
+		return prefix;
+	}
+
+	public void setPrefix(String prefix) {
+		this.prefix = prefix;
+	}
+}
+
+

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/TextStreamRedirector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ValueCollector.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ValueCollector.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ValueCollector.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ValueCollector.java Mon Nov 23 15:53:48 2009
@@ -1,87 +1,87 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-import java.lang.reflect.Method;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.kato.tck.api.TCKException;
-
-
-public class ValueCollector {
-
-	private Map variables=new TreeMap();
-
-	/**
-	 * Creates collector with default values
-	 * @param arguments
-	 */
-	public ValueCollector(List arguments) {
-		
-		
-		Iterator i=arguments.iterator();
-		while(i.hasNext()) {
-			String value=(String) i.next();
-			collect(value,null);
-		}
-	}
-	public ValueCollector() {
-
-	}
-
-
-	/**
-	 * Collects  variable settings
-	 * 
-	 * If a method registers a conflicting requirement
-	 * a TCK exception is thrown.
-	 *  
-	 * @param var - variable to record 
-	 * @param method - method doing the recording
-	 * 
-	 */
-
-	public void collect(String key,Method method) {
-
-		if(variables.containsKey(key)==false) {
-			variables.put(key, method);
-
-		}
-		else {
-			// key clash
-			Method original=(Method) variables.get(key);
-			throw new TCKException("unable to register key "+key+" for "+method+" value conflicts with previously registered key from "+original);
-		}
-	}
-
-	/**
-	 * Returns values as a list
-	 * 
-	 */
-	public List asList() {
-		List list=new LinkedList();
-		list.addAll(variables.keySet());
-		return list;
-	}
-	/**
-	 * @return
-	 */
-	public int size() {
-		return variables.size();
-	}
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+import java.lang.reflect.Method;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.kato.tck.api.TCKException;
+
+
+public class ValueCollector {
+
+	private Map variables=new TreeMap();
+
+	/**
+	 * Creates collector with default values
+	 * @param arguments
+	 */
+	public ValueCollector(List arguments) {
+		
+		
+		Iterator i=arguments.iterator();
+		while(i.hasNext()) {
+			String value=(String) i.next();
+			collect(value,null);
+		}
+	}
+	public ValueCollector() {
+
+	}
+
+
+	/**
+	 * Collects  variable settings
+	 * 
+	 * If a method registers a conflicting requirement
+	 * a TCK exception is thrown.
+	 *  
+	 * @param var - variable to record 
+	 * @param method - method doing the recording
+	 * 
+	 */
+
+	public void collect(String key,Method method) {
+
+		if(variables.containsKey(key)==false) {
+			variables.put(key, method);
+
+		}
+		else {
+			// key clash
+			Method original=(Method) variables.get(key);
+			throw new TCKException("unable to register key "+key+" for "+method+" value conflicts with previously registered key from "+original);
+		}
+	}
+
+	/**
+	 * Returns values as a list
+	 * 
+	 */
+	public List asList() {
+		List list=new LinkedList();
+		list.addAll(variables.keySet());
+		return list;
+	}
+	/**
+	 * @return
+	 */
+	public int size() {
+		return variables.size();
+	}
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/ValueCollector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatistics.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatistics.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatistics.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatistics.java Mon Nov 23 15:53:48 2009
@@ -1,33 +1,33 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness;
-
-public class VisitStatistics {
-
-	public int testcaseInstantiationFailures=0;
-	public int testcaseClassesAccepted=0;
-	public int testcasesFound=0;
-	public int matchedFiles=0;
-	public int unmatchedFiles=0;
-	public int archiveClassEntries=0;
-	public int archiveEntries=0;
-	public int fileRoots=0;
-	public int containers=0;
-	public int directoryRoots=0;
-	public int roots=0;
-	public int ignoredContainers=0;
-	public int notroots=0;
-	public int missingRoots=0;
-	
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness;
+
+public class VisitStatistics {
+
+	public int testcaseInstantiationFailures=0;
+	public int testcaseClassesAccepted=0;
+	public int testcasesFound=0;
+	public int matchedFiles=0;
+	public int unmatchedFiles=0;
+	public int archiveClassEntries=0;
+	public int archiveEntries=0;
+	public int fileRoots=0;
+	public int containers=0;
+	public int directoryRoots=0;
+	public int roots=0;
+	public int ignoredContainers=0;
+	public int notroots=0;
+	public int missingRoots=0;
+	
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatistics.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/VisitStatisticsReporter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/CheckPointHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/CheckPointRunner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ConfigurationExtractor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/IDumpTrigger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/IScenerioSetupHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/PlaceboDumpTrigger.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/PlaceboDumpTrigger.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/PlaceboDumpTrigger.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/PlaceboDumpTrigger.java Mon Nov 23 15:53:48 2009
@@ -1,43 +1,43 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
-package org.apache.kato.tck.harness.scenario;
-
-import java.io.File;
-import java.io.IOException;
-
-public class PlaceboDumpTrigger implements IDumpTrigger {
-
-	public void dump() {
-		String target=System.getProperty("kato.dump.placebo.location");
-		File dump=null;
-		if(target==null) {
-			dump=new File("kato.dump.placebo");
-		}
-		else {
-			File root=new File(target);
-			dump=new File(root,"kato.dump.placebo");
-		}
-		System.out.println("Placebo Dump Triggered to "+dump.getAbsolutePath());
-		
-		try {
-			dump.createNewFile();
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-			
-		}
-		
-	}
-
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+
+package org.apache.kato.tck.harness.scenario;
+
+import java.io.File;
+import java.io.IOException;
+
+public class PlaceboDumpTrigger implements IDumpTrigger {
+
+	public void dump() {
+		String target=System.getProperty("kato.dump.placebo.location");
+		File dump=null;
+		if(target==null) {
+			dump=new File("kato.dump.placebo");
+		}
+		else {
+			File root=new File(target);
+			dump=new File(root,"kato.dump.placebo");
+		}
+		System.out.println("Placebo Dump Triggered to "+dump.getAbsolutePath());
+		
+		try {
+			dump.createNewFile();
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+			
+		}
+		
+	}
+
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/PlaceboDumpTrigger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioAnchor.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioAnchor.java?rev=883384&r1=883383&r2=883384&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioAnchor.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioAnchor.java Mon Nov 23 15:53:48 2009
@@ -1,50 +1,50 @@
-/*******************************************************************************
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-package org.apache.kato.tck.harness.scenario;
-
-/**
- * A static class used by the scenerio setup process to find the current setup handler
- * 
- * 
- *
- */
-public class ScenarioAnchor {
-
-	private static IScenerioSetupHandler handler=null;
-
-	public static IScenerioSetupHandler getHandler() {
-		return handler;
-	}
-	
-	public static void setHandler(IScenerioSetupHandler newHandler) {
-		
-		handler=newHandler;
-	}
-	
-	/**
-	 * Anchors the provided object in a static list so that
-	 * it cannot be garbage collected.
-	 * 
-	 * The objects configuration methods are executed according to 
-	 * the contract described by IScenarioElement
-	 * 
-	 * @param o object to configure
-	 */
-	public void register(ScenarioElement o) {
-
-		
-		handler.execute(o);
-	}
-
-}
+/*******************************************************************************
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+package org.apache.kato.tck.harness.scenario;
+
+/**
+ * A static class used by the scenerio setup process to find the current setup handler
+ * 
+ * 
+ *
+ */
+public class ScenarioAnchor {
+
+	private static IScenerioSetupHandler handler=null;
+
+	public static IScenerioSetupHandler getHandler() {
+		return handler;
+	}
+	
+	public static void setHandler(IScenerioSetupHandler newHandler) {
+		
+		handler=newHandler;
+	}
+	
+	/**
+	 * Anchors the provided object in a static list so that
+	 * it cannot be garbage collected.
+	 * 
+	 * The objects configuration methods are executed according to 
+	 * the contract described by IScenarioElement
+	 * 
+	 * @param o object to configure
+	 */
+	public void register(ScenarioElement o) {
+
+		
+		handler.execute(o);
+	}
+
+}

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioAnchor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioLauncher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenerioSetupHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native