You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/02/13 05:41:19 UTC
svn commit: r743982 - in /incubator/etch/trunk: ./
interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/
interoptester/src/main/java/org/apache/etch/interoptester/
Author: sccomer
Date: Fri Feb 13 04:41:18 2009
New Revision: 743982
URL: http://svn.apache.org/viewvc?rev=743982&view=rev
Log:
tone down some of the debugging output, account for listener api change.
Modified:
incubator/etch/trunk/.classpath
incubator/etch/trunk/interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/MainIOTListener.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/DefaultRunningProg.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/InteropTest.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/MainInteropTester.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Prog.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Program.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Run.java
incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Test.java
Modified: incubator/etch/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/.classpath?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/.classpath (original)
+++ incubator/etch/trunk/.classpath Fri Feb 13 04:41:18 2009
@@ -1,22 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
- <!--
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you 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. *
- -->
<classpath>
<classpathentry kind="src" path="util/src/main/java"/>
<classpathentry kind="src" path="util/src/test/java"/>
Modified: incubator/etch/trunk/interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/MainIOTListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/MainIOTListener.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/MainIOTListener.java (original)
+++ incubator/etch/trunk/interoptester/example/src/main/java/org/apache/etch/interoptester/example/iot/MainIOTListener.java Fri Feb 13 04:41:18 2009
@@ -50,7 +50,7 @@
String uri = args.length > 0 ? args[0] : "tcp://127.0.0.1:4001";
- Transport<ServerFactory> listener = IOTHelper.newListener( uri, null,
+ ServerFactory listener = IOTHelper.newListener( uri, null,
new MainIOTListener() );
// Start the Listener
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/DefaultRunningProg.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/DefaultRunningProg.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/DefaultRunningProg.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/DefaultRunningProg.java Fri Feb 13 04:41:18 2009
@@ -160,6 +160,6 @@
private void report( String msg )
{
- System.out.println( this.toString() + ": " + msg );
+ //System.out.println( this.toString() + ": " + msg );
}
}
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/InteropTest.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/InteropTest.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/InteropTest.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/InteropTest.java Fri Feb 13 04:41:18 2009
@@ -163,14 +163,14 @@
public void run( Map<String, String> overrides ) throws Exception
{
- System.out.println( "InteropTest.run: overrides = "+overrides );
+ //System.out.println( "InteropTest.run: overrides = "+overrides );
// construct substs out of params + overrides
Map<String, String> substs = Param.processOverrides( "interoptest",
params, overrides );
- System.out.println( "InteropTest.run: substs = "+substs );
+ //System.out.println( "InteropTest.run: substs = "+substs );
// run each "run" defined in interoptest
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/MainInteropTester.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/MainInteropTester.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/MainInteropTester.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/MainInteropTester.java Fri Feb 13 04:41:18 2009
@@ -67,7 +67,7 @@
overrides.put( x[0], x[1] );
}
- System.out.println( "main: overrides = " + overrides );
+ //System.out.println( "main: overrides = " + overrides );
new Thread( new Runnable()
{
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Prog.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Prog.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Prog.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Prog.java Fri Feb 13 04:41:18 2009
@@ -130,12 +130,12 @@
private Map<String, String> processSubst( String who,
Map<String, String> substs )
{
- System.out.println( "Prog."+who+": name "+name+", substs = "+substs );
+ //System.out.println( "Prog."+who+": name "+name+", substs = "+substs );
Map<String, String> overrides = Arg.processSubst( "prog", args,
substs );
- System.out.println( "Prog."+who+": name "+name+", overrides = "+overrides );
+ //System.out.println( "Prog."+who+": name "+name+", overrides = "+overrides );
return overrides;
}
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Program.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Program.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Program.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Program.java Fri Feb 13 04:41:18 2009
@@ -278,7 +278,7 @@
Map<String, String> substs = processOverrides( "start", overrides );
List<String> tkns = processTokens( substs );
Map<String, String> nvs = processEnvs( substs );
- System.out.printf( "Program.start: tokens %s envs %s\n", tkns, nvs );
+ //System.out.printf( "Program.start: tokens %s envs %s\n", tkns, nvs );
DefaultRunningProg rp = new DefaultRunningProg( tkns, nvs, stdoutTag, stderrTag );
try
{
@@ -309,7 +309,7 @@
Map<String, String> substs = processOverrides( "run", overrides );
List<String> tkns = processTokens( substs );
Map<String, String> nvs = processEnvs( substs );
- System.out.printf( "Program.run: tokens %s envs %s\n", tkns, nvs );
+ //System.out.printf( "Program.run: tokens %s envs %s\n", tkns, nvs );
DefaultRunningProg rp = new DefaultRunningProg( tkns, nvs, stdoutTag, stderrTag );
try
@@ -345,12 +345,12 @@
private Map<String, String> processOverrides( String who,
Map<String, String> overrides )
{
- System.out.println( "Program."+who+": name "+name+", overrides = "+overrides );
+ //System.out.println( "Program."+who+": name "+name+", overrides = "+overrides );
Map<String, String> substs = Param.processOverrides( "program", params,
overrides );
- System.out.println( "Program."+who+": name "+name+", substs = "+substs );
+ //System.out.println( "Program."+who+": name "+name+", substs = "+substs );
return substs;
}
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Run.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Run.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Run.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Run.java Fri Feb 13 04:41:18 2009
@@ -123,7 +123,7 @@
disable = Boolean.valueOf( te.getCdataValue() );
else
disable = true;
- System.out.println( "run "+name+" test "+test+", disable = "+disable );
+ //System.out.println( "run "+name+" test "+test+", disable = "+disable );
return true;
}
Modified: incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Test.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Test.java?rev=743982&r1=743981&r2=743982&view=diff
==============================================================================
--- incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Test.java (original)
+++ incubator/etch/trunk/interoptester/src/main/java/org/apache/etch/interoptester/Test.java Fri Feb 13 04:41:18 2009
@@ -203,12 +203,12 @@
public void run( Map<String, String> overrides ) throws Exception
{
- System.out.println( "Test.run: "+name+", overrides = "+overrides );
+ //System.out.println( "Test.run: "+name+", overrides = "+overrides );
Map<String, String> substs = Param.processOverrides( "test", params,
overrides );
- System.out.println( "Test.run: "+name+", substs = "+substs );
+ //System.out.println( "Test.run: "+name+", substs = "+substs );
runProgs( setup, substs );
try