svn commit: r646704 - /commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
Author: nicolas
Date: Thu Apr 10 02:14:34 2008
New Revision: 646704
URL: http://svn.apache.org/viewvc?rev=646704view=rev
Log:
test fix
Modified:
commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
Modified:
commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot?rev=646704r1=646703r2=646704view=diff
==
---
commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
(original)
+++
commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
Thu Apr 10 02:14:34 2008
@@ -5,28 +5,28 @@
{ color: 1, label: concurrency.sum,
data: []},
{ color: 2, label: concurrency.min,
- data: [[1,0][2,1]]},
+ data: [[1,0],[2,1]]},
{ color: 3, label: concurrency.max,
- data: [[1,0][2,1]]},
+ data: [[1,0],[2,1]]},
{ color: 4, label: concurrency.mean,
- data: [[1,NaN][2,0.00]]},
+ data: [[1,NaN],[2,0.00]]},
{ color: 5, label: concurrency.deviation,
- data: [[1,NaN][2,NaN]]},
+ data: [[1,NaN],[2,NaN]]},
{ color: 6, label: concurrency.value,
- data: [[1,0][2,1]]},
+ data: [[1,0],[2,1]]},
{ color: 7, label: performances.hits,
- data: [[1,1][2,0]]},
+ data: [[1,1],[2,0]]},
{ color: 8, label: performances.sum,
- data: [[1,10][2,0]]},
+ data: [[1,10],[2,0]]},
{ color: 9, label: performances.min,
- data: [[1,10][2,0]]},
+ data: [[1,10],[2,0]]},
{ color: 10, label: performances.max,
- data: [[1,10][2,0]]},
+ data: [[1,10],[2,0]]},
{ color: 11, label: performances.mean,
- data: [[1,10.00][2,NaN]]},
+ data: [[1,10.00],[2,NaN]]},
{ color: 12, label: performances.deviation,
- data: [[1,NaN][2,NaN]]},
+ data: [[1,NaN],[2,NaN]]},
{ color: 13, label: performances.value,
- data: [[1,10][2,0]]}
+ data: [[1,10],[2,0]]}
] );
svn commit: r646698 - in /commons/sandbox/monitoring/trunk/src: main/java/org/apache/commons/monitoring/listeners/ main/java/org/apache/commons/monitoring/reporting/ main/java/org/apache/commons/monit
Author: nicolas
Date: Thu Apr 10 02:02:07 2008
New Revision: 646698
URL: http://svn.apache.org/viewvc?rev=646698view=rev
Log:
generate Flot graph output
Added:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
(with props)
commons/sandbox/monitoring/trunk/src/test/resources/org/apache/commons/monitoring/reporting/RendererTest.flot
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/listeners/HistorizedRepositoryDecorator.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/HtmlRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/OptionsSupport.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/Renderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/TxtRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringServlet.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/web/NiceHtmlRenderer.java
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/listeners/HistorizedRepositoryDecorator.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/listeners/HistorizedRepositoryDecorator.java?rev=646698r1=646697r2=646698view=diff
==
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/listeners/HistorizedRepositoryDecorator.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/listeners/HistorizedRepositoryDecorator.java
Thu Apr 10 02:02:07 2008
@@ -24,8 +24,10 @@
import java.util.Set;
import org.apache.commons.monitoring.Monitor;
+import org.apache.commons.monitoring.Monitoring;
import org.apache.commons.monitoring.Repository;
import org.apache.commons.monitoring.StopWatch;
+import org.apache.commons.monitoring.Unit;
import org.apache.commons.monitoring.reporting.AbstractPeriodicLogger;
/**
@@ -42,7 +44,6 @@
private int size;
-@SuppressWarnings( serial )
public HistorizedRepositoryDecorator( long period, final int size,
Observable repository )
{
super( period, repository );
@@ -68,6 +69,8 @@
{
history.remove( history.size() );
}
+
+Monitoring.getMonitor( test ).getCounter( Monitor.PERFORMANCES
).add( (long) (Math.random() * 10), Unit.MILLIS );
}
public void addListener( Listener listener )
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java?rev=646698r1=646697r2=646698view=diff
==
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/AbstractRenderer.java
Thu Apr 10 02:02:07 2008
@@ -42,9 +42,17 @@
public abstract class AbstractRenderer
implements Renderer
{
-public final void render( Context ctx, CollectionMonitor monitors )
+private String contentType;
+
+
+protected static final String MONITORS = monitors;
+
+protected static final String ROLES = roles;
+
+public AbstractRenderer( String contentType )
{
-render( ctx, monitors, new OptionsSupport() );
+super();
+this.contentType = contentType;
}
public void render( Context ctx, CollectionMonitor monitors, Options
options )
@@ -68,8 +76,8 @@
protected void prepareRendering( Context ctx, CollectionMonitor
monitors, Options options )
{
ListString roles = getRoles( monitors, options );
-ctx.put( roles, roles );
-ctx.put( monitors, monitors );
+ctx.put( ROLES, roles );
+ctx.put( MONITORS, monitors );
}
protected void hasNext( Context ctx, Class? type )
@@ -102,7 +110,7 @@
@SuppressWarnings( unchecked )
protected void renderStatValues( Context ctx, Monitor monitor, Options
options )
{
-ListString
svn commit: r646695 - /commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java
Author: sgoeschl
Date: Thu Apr 10 01:56:05 2008
New Revision: 646695
URL: http://svn.apache.org/viewvc?rev=646695view=rev
Log:
Added support for running the tests on OpenVMS otherwise the tests fail with
Test not supported for this OS
Modified:
commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java
Modified:
commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java?rev=646695r1=646694r2=646695view=diff
==
---
commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java
(original)
+++
commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/TestUtil.java
Thu Apr 10 01:56:05 2008
@@ -34,6 +34,8 @@
return new File(script + .bat);
} else if (OS.isFamilyUnix()) {
return new File(script + .sh);
+} else if (OS.isFamilyOpenVms()) {
+return new File(script + .dcl);
} else {
throw new AssertionFailedError(Test not supported for this OS);
}
svn commit: r646701 - in /commons/sandbox/exec/trunk/src/test/scripts: error.dcl forever.dcl test.dcl
Author: sgoeschl Date: Thu Apr 10 02:08:15 2008 New Revision: 646701 URL: http://svn.apache.org/viewvc?rev=646701view=rev Log: Adding empty DCL files to be filled with real code - btw, no idea what the proper line ending look like on OpenVMS. Added: commons/sandbox/exec/trunk/src/test/scripts/error.dcl (with props) commons/sandbox/exec/trunk/src/test/scripts/forever.dcl commons/sandbox/exec/trunk/src/test/scripts/test.dcl Added: commons/sandbox/exec/trunk/src/test/scripts/error.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/error.dcl?rev=646701view=auto == --- commons/sandbox/exec/trunk/src/test/scripts/error.dcl (added) +++ commons/sandbox/exec/trunk/src/test/scripts/error.dcl Thu Apr 10 02:08:15 2008 @@ -0,0 +1 @@ +Please fill out the gaps \ No newline at end of file Propchange: commons/sandbox/exec/trunk/src/test/scripts/error.dcl -- svn:eol-style = native Added: commons/sandbox/exec/trunk/src/test/scripts/forever.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.dcl?rev=646701view=auto == --- commons/sandbox/exec/trunk/src/test/scripts/forever.dcl (added) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.dcl Thu Apr 10 02:08:15 2008 @@ -0,0 +1 @@ +Please fill out the gaps \ No newline at end of file Added: commons/sandbox/exec/trunk/src/test/scripts/test.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/test.dcl?rev=646701view=auto == --- commons/sandbox/exec/trunk/src/test/scripts/test.dcl (added) +++ commons/sandbox/exec/trunk/src/test/scripts/test.dcl Thu Apr 10 02:08:15 2008 @@ -0,0 +1 @@ +Please fill out the gaps \ No newline at end of file
svn commit: r646693 - /commons/sandbox/exec/trunk/build.xml
Author: sgoeschl
Date: Thu Apr 10 01:53:36 2008
New Revision: 646693
URL: http://svn.apache.org/viewvc?rev=646693view=rev
Log:
Creating a proper name for test distribution, e.g. exec-test-1.0-SNAPSHOT.zip
Modified:
commons/sandbox/exec/trunk/build.xml
Modified: commons/sandbox/exec/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/build.xml?rev=646693r1=646692r2=646693view=diff
==
--- commons/sandbox/exec/trunk/build.xml (original)
+++ commons/sandbox/exec/trunk/build.xml Thu Apr 10 01:53:36 2008
@@ -98,7 +98,7 @@
echo==/echo
/target
- target name=test-zip depends=compile, junit-present, compile-tests
description=Create a zip containing the test environment
+ target name=test-zip depends=clean, compile, junit-present,
compile-tests description=Create a zip containing the test environment
mkdir dir=${maven.build.directory}/dist/lib/
!-- create the libraries --
copy file=${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar
todir=${maven.build.directory}/dist/lib/
@@ -111,7 +111,7 @@
fileset dir=${basedir}/src/test/scripts/
/copy
!-- build the zip file --
-zip destfile=${maven.build.directory}/exec-${maven.build.version}.zip
+zip
destfile=${maven.build.directory}/exec-test-${maven.build.version}.zip
fileset dir=${maven.build.directory}/dist
filename name=**/*.*/
/fileset
svn commit: r646694 - in /commons/sandbox/exec/trunk/src/test/scripts: error.sh forever.bat forever.sh test.bat test.sh
Author: sgoeschl Date: Thu Apr 10 01:54:45 2008 New Revision: 646694 URL: http://svn.apache.org/viewvc?rev=646694view=rev Log: Adding a few comments to the scripts to indicate what they are doing Modified: commons/sandbox/exec/trunk/src/test/scripts/error.sh commons/sandbox/exec/trunk/src/test/scripts/forever.bat commons/sandbox/exec/trunk/src/test/scripts/forever.sh commons/sandbox/exec/trunk/src/test/scripts/test.bat commons/sandbox/exec/trunk/src/test/scripts/test.sh Modified: commons/sandbox/exec/trunk/src/test/scripts/error.sh URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/error.sh?rev=646694r1=646693r2=646694view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/error.sh (original) +++ commons/sandbox/exec/trunk/src/test/scripts/error.sh Thu Apr 10 01:54:45 2008 @@ -18,6 +18,7 @@ # # -echo FOO.$TEST_ENV_VAR.$1 +# do something and return en error result code +echo FOO.$TEST_ENV_VAR.$1 exit 1 Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.bat URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.bat?rev=646694r1=646693r2=646694view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/forever.bat (original) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.bat Thu Apr 10 01:54:45 2008 @@ -18,7 +18,7 @@ REM See the License for the specific language governing permissions and REM limitations under the License. [EMAIL PROTECTED] OFF +REM run an infinite loop so the script will never ever terminate on its behalf :LOOP ECHO . .\target\forever.txt Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.sh URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.sh?rev=646694r1=646693r2=646694view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/forever.sh (original) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.sh Thu Apr 10 01:54:45 2008 @@ -17,6 +17,8 @@ # limitations under the License. # +# run an infinite loop so the script will never ever terminate on its behalf + while test notempty do sleep 1 Modified: commons/sandbox/exec/trunk/src/test/scripts/test.bat URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/test.bat?rev=646694r1=646693r2=646694view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/test.bat (original) +++ commons/sandbox/exec/trunk/src/test/scripts/test.bat Thu Apr 10 01:54:45 2008 @@ -18,4 +18,7 @@ REM REM +REM print the given environment variable and command line parameter +REM since this is verified by the regression test + @ECHO FOO.%TEST_ENV_VAR%.%1 Modified: commons/sandbox/exec/trunk/src/test/scripts/test.sh URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/test.sh?rev=646694r1=646693r2=646694view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/test.sh (original) +++ commons/sandbox/exec/trunk/src/test/scripts/test.sh Thu Apr 10 01:54:45 2008 @@ -17,4 +17,7 @@ # limitations under the License. # +# print the given environment variable and command line parameter +# since this is verified by the regression test + echo FOO.$TEST_ENV_VAR.$1
svn commit: r646777 [6/6] - in /commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ functors/ iterator
Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java?rev=646777r1=646776r2=646777view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java Thu Apr 10 05:33:15 2008 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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 * Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSet.java?rev=646777r1=646776r2=646777view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSet.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSet.java Thu Apr 10 05:33:15 2008 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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 * Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSortedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSortedSet.java?rev=646777r1=646776r2=646777view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSortedSet.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TransformedSortedSet.java Thu Apr 10 05:33:15 2008 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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 * Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TypedSet.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TypedSet.java?rev=646777r1=646776r2=646777view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/java/org/apache/commons/collections/set/TypedSet.java (original) +++
svn commit: r646780 [4/4] - in /commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ iterators/ keyvalu
Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestMultiValueMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=646780r1=646779r2=646780view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestMultiValueMap.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Thu Apr 10 05:48:07 2008 @@ -1,17 +1,18 @@ /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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. + * 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.commons.collections.map; Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedMap.java?rev=646780r1=646779r2=646780view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedMap.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedMap.java Thu Apr 10 05:48:07 2008 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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 * Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java?rev=646780r1=646779r2=646780view=diff == --- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java (original) +++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java Thu Apr 10 05:48:07 2008 @@ -1,9 +1,10 @@ /* - * Copyright 2003-2004 The Apache Software Foundation - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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
svn commit: r646817 - in /commons/sandbox/exec/trunk/src/test/scripts: error.dcl forever.dcl test.dcl
Author: sgoeschl Date: Thu Apr 10 07:26:34 2008 New Revision: 646817 URL: http://svn.apache.org/viewvc?rev=646817view=rev Log: Setting EOL style for empty DCL script to 'CR' Modified: commons/sandbox/exec/trunk/src/test/scripts/error.dcl (props changed) commons/sandbox/exec/trunk/src/test/scripts/forever.dcl (props changed) commons/sandbox/exec/trunk/src/test/scripts/test.dcl (props changed) Propchange: commons/sandbox/exec/trunk/src/test/scripts/error.dcl -- --- svn:eol-style (original) +++ svn:eol-style Thu Apr 10 07:26:34 2008 @@ -1 +1 @@ -native +CR Propchange: commons/sandbox/exec/trunk/src/test/scripts/forever.dcl -- svn:eol-style = CR Propchange: commons/sandbox/exec/trunk/src/test/scripts/test.dcl -- svn:eol-style = CR
svn commit: r646842 - /commons/sandbox/exec/trunk/src/test/scripts/forever.sh
Author: sgoeschl Date: Thu Apr 10 08:22:17 2008 New Revision: 646842 URL: http://svn.apache.org/viewvc?rev=646842view=rev Log: Changed the usage of the echo statement to work with HP-UX (thanks to sebb) Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.sh Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.sh URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.sh?rev=646842r1=646841r2=646842view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/forever.sh (original) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.sh Thu Apr 10 08:22:17 2008 @@ -22,6 +22,5 @@ while test notempty do sleep 1 - echo -n . - # echo -n . ./target/forever.txt + echo '.\c' ./target/forever.txt done
svn commit: r646846 - /commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
Author: nicolas
Date: Thu Apr 10 08:34:13 2008
New Revision: 646846
URL: http://svn.apache.org/viewvc?rev=646846view=rev
Log:
fix test
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java?rev=646846r1=646845r2=646846view=diff
==
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/FlotRenderer.java
Thu Apr 10 08:34:13 2008
@@ -41,10 +41,8 @@
* /pre
*
* /li
- * li
- * a lt;div id=placeholdergt; to draw the graph into, having
ttwidth/tt and ttheight/tt
- * style set.
- * /li
+ * li a lt;div id=placeholdergt; to draw the graph into, having
+ * ttwidth/tt and ttheight/tt style set. /li
* /ul
*
* @see http://code.google.com/p/flot/
@@ -68,7 +66,7 @@
* org.apache.commons.monitoring.reporting.Renderer.Options)
*/
@Override
-public void render( Context ctx, CollectionMonitor monitors, Options
options )
+public void render( final Context ctx, CollectionMonitor monitors,
Options options )
{
prepareRendering( ctx, monitors, options );
ctx.print( $.plot($('#placeholder'), [ );
@@ -96,7 +94,8 @@
ctx.print( \, data: );
ctx.print( [ );
int x = 0;
-for ( IteratorMonitor iterator = monitors.iterator();
iterator.hasNext(); )
+int rendered = 0;
+for ( final IteratorMonitor iterator = monitors.iterator();
iterator.hasNext(); )
{
Monitor monitor = iterator.next();
x++;
@@ -106,17 +105,27 @@
continue;
}
ctx.put( x, x );
+if ( rendered 0 )
+{
+ctx.print( , );
+}
+ctx.put( rendered, false );
render( ctx, value, new OptionsSupport()
{
@Override
public boolean render( String role, String string )
{
-return string.equals( attribute );
+boolean render = string.equals( attribute );
+if ( render )
+{
+ctx.put( rendered, true );
+}
+return render;
}
-});
-if ( iterator.hasNext() )
+} );
+if ( ( (Boolean) ctx.get( rendered ) ).booleanValue() )
{
-ctx.print( , );
+rendered++;
}
}
ctx.print( ] );
@@ -151,7 +160,9 @@
/**
* [EMAIL PROTECTED]
- * @see
org.apache.commons.monitoring.reporting.AbstractRenderer#render(org.apache.commons.monitoring.reporting.Context,
org.apache.commons.monitoring.Monitor.Key)
+ *
+ * @see
org.apache.commons.monitoring.reporting.AbstractRenderer#render(org.apache.commons.monitoring.reporting.Context,
+ * org.apache.commons.monitoring.Monitor.Key)
*/
@Override
protected void render( Context ctx, Key key )
@@ -161,7 +172,10 @@
/**
* [EMAIL PROTECTED]
- * @see
org.apache.commons.monitoring.reporting.AbstractRenderer#renderDetached(org.apache.commons.monitoring.reporting.Context,
org.apache.commons.monitoring.listeners.Detachable,
org.apache.commons.monitoring.reporting.Renderer.Options)
+ *
+ * @see
org.apache.commons.monitoring.reporting.AbstractRenderer#renderDetached(org.apache.commons.monitoring.reporting.Context,
+ * org.apache.commons.monitoring.listeners.Detachable,
+ * org.apache.commons.monitoring.reporting.Renderer.Options)
*/
@Override
protected void renderDetached( Context ctx, Detachable detached, Options
options )
svn commit: r646848 - /commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml
Author: niallp
Date: Thu Apr 10 08:37:13 2008
New Revision: 646848
URL: http://svn.apache.org/viewvc?rev=646848view=rev
Log:
Fix test reports directory
Modified:
commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml
Modified: commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml?rev=646848r1=646847r2=646848view=diff
==
--- commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml
(original)
+++ commons/proper/collections/branches/COLLECTIONS_3_2_BRANCH/build.xml Thu
Apr 10 08:37:13 2008
@@ -52,6 +52,7 @@
property name=build.conf value=${build.home}/conf/
property name=build.classes value=${build.home}/classes/
property name=build.tests value=${build.home}/tests/
+ property name=build.test.reports value=${build.home}/test-reports/
property name=build.docs value=${build.home}/docs/apidocs/
property name=build.src value=${build.home}/src-ide /
@@ -284,6 +285,7 @@
!-- Runs all tests --
target name=-test-all depends=compile.tests unless=testcase
+mkdir dir=${build.test.reports}/
junit printsummary=yes haltonfailure=yes showoutput=yes
formatter type=brief /
classpath
@@ -292,7 +294,7 @@
pathelement location=${junit.jar}/
/classpath
- batchtest fork=yes
+ batchtest fork=yes todir=${build.test.reports}
fileset dir=${source.test}
include name=**/Test*.java/
exclude name=**/TestAll*.java/
@@ -318,7 +320,7 @@
pathelement location=${junit.jar}/
/classpath
- test name=${testcase} fork=yes
+ test name=${testcase} fork=yes todir=${build.test.reports}
formatter type=brief usefile=false /
/test
/junit
svn commit: r646878 - in /commons/sandbox/exec/trunk/src/test/scripts: error.dcl forever.dcl test.dcl
Author: sebb Date: Thu Apr 10 10:15:07 2008 New Revision: 646878 URL: http://svn.apache.org/viewvc?rev=646878view=rev Log: Initial set of DCL test scripts Modified: commons/sandbox/exec/trunk/src/test/scripts/error.dcl commons/sandbox/exec/trunk/src/test/scripts/forever.dcl commons/sandbox/exec/trunk/src/test/scripts/test.dcl Modified: commons/sandbox/exec/trunk/src/test/scripts/error.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/error.dcl?rev=646878r1=646877r2=646878view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/error.dcl (original) +++ commons/sandbox/exec/trunk/src/test/scripts/error.dcl Thu Apr 10 10:15:07 2008 @@ -1 +1 @@ -Please fill out the gaps \ No newline at end of file +$!! $! $! 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. $! $!! $! $! do something and return an error res ult code $! $ write sys$output FOO.''TEST_ENV_VAR'.''P1' $! $ exit 2 ! this is an Error \ No newline at end of file Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.dcl?rev=646878r1=646877r2=646878view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/forever.dcl (original) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.dcl Thu Apr 10 10:15:07 2008 @@ -1 +1 @@ -Please fill out the gaps \ No newline at end of file +$!! $! $! 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. $! $!! $! $! run an infinite loop so the script w ill never ever terminate $! $LOOP: $ WAIT 00:00:01 $ WRITE SYS$OUTPUT . ! this includes a new line ;-) $ GOTO LOOP \ No newline at end of file Modified: commons/sandbox/exec/trunk/src/test/scripts/test.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/test.dcl?rev=646878r1=646877r2=646878view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/test.dcl (original) +++ commons/sandbox/exec/trunk/src/test/scripts/test.dcl Thu Apr 10 10:15:07 2008 @@ -1 +1 @@ -Please fill out the gaps \ No newline at end of file +$!! $! $! 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. $!
svn commit: r646882 - /commons/sandbox/exec/trunk/src/test/bin/testme.dcl
Author: sebb Date: Thu Apr 10 10:21:19 2008 New Revision: 646882 URL: http://svn.apache.org/viewvc?rev=646882view=rev Log: Test script for VMS (eol=CR; not sure if that is necessary; native might be better) Added: commons/sandbox/exec/trunk/src/test/bin/testme.dcl (with props) Added: commons/sandbox/exec/trunk/src/test/bin/testme.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/bin/testme.dcl?rev=646882view=auto == --- commons/sandbox/exec/trunk/src/test/bin/testme.dcl (added) +++ commons/sandbox/exec/trunk/src/test/bin/testme.dcl Thu Apr 10 10:21:19 2008 @@ -0,0 +1 @@ +$!! $! $! 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. $! $!! $! $! Run the test suite $! $ create/direc tory [.target] $ java -Dorg.apache.commons.exec.lenient=false -Dorg.apache.commons.exec.debug=false - -cp ./lib/junit-3.8.1.jar:./lib/exec-test-1.0-SNAPSHOT.jar:./lib/exec-1.0-SNAPSHOT.jar - org.apache.commons.exec.TestRunner \ No newline at end of file Propchange: commons/sandbox/exec/trunk/src/test/bin/testme.dcl -- svn:eol-style = CR
svn commit: r646885 - /commons/sandbox/exec/trunk/NOTICE.txt
Author: sebb Date: Thu Apr 10 10:25:30 2008 New Revision: 646885 URL: http://svn.apache.org/viewvc?rev=646885view=rev Log: Correct the name and (C) years Modified: commons/sandbox/exec/trunk/NOTICE.txt Modified: commons/sandbox/exec/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/NOTICE.txt?rev=646885r1=646884r2=646885view=diff == --- commons/sandbox/exec/trunk/NOTICE.txt (original) +++ commons/sandbox/exec/trunk/NOTICE.txt Thu Apr 10 10:25:30 2008 @@ -1,5 +1,5 @@ -Apache Commons CSV -Copyright 2005-2006 The Apache Software Foundation +Apache Commons Exec +Copyright 2005-2008 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
svn commit: r646893 - in /commons/sandbox/exec/trunk/src: changes/ main/java/org/apache/commons/exec/util/ test/bin/ test/java/org/apache/commons/exec/util/ test/scripts/
Author: sebb Date: Thu Apr 10 10:35:37 2008 New Revision: 646893 URL: http://svn.apache.org/viewvc?rev=646893view=rev Log: Add some missing eol-style settings Modified: commons/sandbox/exec/trunk/src/changes/changes.xml (props changed) commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/DebugUtils.java (props changed) commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java (props changed) commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java (props changed) commons/sandbox/exec/trunk/src/test/bin/testme.sh (props changed) commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/util/MapUtilTest.java (props changed) commons/sandbox/exec/trunk/src/test/scripts/forever.bat (props changed) Propchange: commons/sandbox/exec/trunk/src/changes/changes.xml -- svn:eol-style = native Propchange: commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/DebugUtils.java -- svn:eol-style = native Propchange: commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java -- svn:eol-style = native Propchange: commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/util/StringUtils.java -- svn:eol-style = native Propchange: commons/sandbox/exec/trunk/src/test/bin/testme.sh -- svn:eol-style = LF Propchange: commons/sandbox/exec/trunk/src/test/java/org/apache/commons/exec/util/MapUtilTest.java -- svn:eol-style = native Propchange: commons/sandbox/exec/trunk/src/test/scripts/forever.bat -- svn:eol-style = CRLF
svn commit: r646900 - /commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java
Author: sebb Date: Thu Apr 10 10:51:32 2008 New Revision: 646900 URL: http://svn.apache.org/viewvc?rev=646900view=rev Log: Javadoc errors Modified: commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java Modified: commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java?rev=646900r1=646899r2=646900view=diff == --- commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java (original) +++ commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/ProcessDestroyer.java Thu Apr 10 10:51:32 2008 @@ -27,26 +27,26 @@ /** * Returns codetrue/code if the specified -* @link java.lang.Process was +* [EMAIL PROTECTED] java.lang.Process} was * successfully added to the list of processes to be destroy. * * @param process * the process to add * @return codetrue/code if the specified -* @link java.lang.Process was +* [EMAIL PROTECTED] java.lang.Process} was * successfully added */ boolean add(Process process); /** * Returns codetrue/code if the specified -* @link java.lang.Process was +* [EMAIL PROTECTED] java.lang.Process} was * successfully removed from the list of processes to be destroy. * * @param process *the process to remove * @return codetrue/code if the specified -* @link java.lang.Process was +* [EMAIL PROTECTED] java.lang.Process} was * successfully removed */ boolean remove(Process process);
svn commit: r646903 - /commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml
Author: sgoeschl Date: Thu Apr 10 11:02:21 2008 New Revision: 646903 URL: http://svn.apache.org/viewvc?rev=646903view=rev Log: Adding a page to collect the sucesses/failures for various operating systems and jvm versions Added: commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml Added: commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml?rev=646903view=auto == --- commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml (added) +++ commons/sandbox/exec/trunk/src/site/xdoc/testmatrix.xml Thu Apr 10 11:02:21 2008 @@ -0,0 +1,128 @@ +?xml version=1.0? +document + properties +titleCommons Exec Test Matrix/title +author email=[EMAIL PROTECTED]Siegfried Goeschl/author + /properties + body +section name=Test Matrix + pThe following table contains the test results of running the comons-exec regression tests on different OS/JVMs/p + table +tr + thOperating System/th + thJVM/th + thStatus/th + thReporter/th +/tr +tr + tdLinux (2.6.22, x86, 32 bit)/td + tdJava HotSpot(TM) Server VMbr/build 1.4.2_13-b06, mixed mode/td + tdPassed/td + tdSimone Gianni/td +/tr +tr + tdLinux (2.6.22, x86, 32 bit)/td + tdJava HotSpot(TM) Server VMbr/build 1.5.0_12-b04, mixed mode/td + tdPassed/td + tdSimone Gianni/td +/tr +tr + tdLinux (2.6.22, x86, 32 bit)/td + tdJava HotSpot(TM) Server VMbr/build 1.6.0_03-b05, mixed mode/td + tdPassed/td + tdSimone Gianni/td +/tr +tr + tdLinux (2.6.22, x86, 64 bit)/td + tdJava HotSpot(TM) 64-Bit Serverbr/build 1.6.0_05-b13, mixed mode/td + tdPassed/td + tdSimone Gianni/td +/tr +tr + tdMac OS X (10.4, x86)/td + tdJava HotSpot(TM) Client VMbr/build 1.4.2-86, mixed mode/td + tdPassed/td + tdSiegfried Goeschl/td +/tr +tr + tdMac OS X (10.4, x86)/td + tdJava HotSpot(TM) Client VMbr/build 1.5.0_13-121, mixed mode, sharing/td + tdPassed/td + tdSiegfried Goeschl/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.3.1_20/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.4.2_17/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.5.0_15/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.5.0_15x64/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.6.0_05/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.6.0_05x64/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.7.0ea_b24/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs Vista Ultimate (64 bit)/td + tdJava(TM) SE Runtime Environmentbr/JDK 1.7.0ea_b24x64/td + tdPassed/td + tdBindul Bhowmik/td +/tr +tr + tdWindowxs XP (SP2)/td + tdJava HotSpot(TM) Client VMbr/build 1.3.2-86, mixed mode/td + tdPassed/td + tdNiall Pemberton/td +/tr +tr + tdWindowxs XP (SP2)/td + tdJava HotSpot(TM) Client VMbr/build 1.4.2-86, mixed mode/td + tdPassed/td + tdNiall Pemberton/td +/tr +tr + tdWindowxs XP (SP2)/td + tdJava HotSpot(TM) Client VMbr/build 1.5.0_13-121, mixed mode, sharing/td + tdPassed/td + tdNiall Pemberton/td +/tr +tr + tdWindowxs XP (SP2)/td + tdJava(TM) SE Runtime Environmentbr/build 1.6.0_05-b13, mixed mode, sharing/td + tdPassed/td + tdNiall Pemberton/td +/tr + /table +/section + /body +/document
svn commit: r646914 - /commons/sandbox/exec/trunk/src/test/scripts/forever.dcl
Author: sebb Date: Thu Apr 10 11:22:00 2008 New Revision: 646914 URL: http://svn.apache.org/viewvc?rev=646914view=rev Log: Better version that does not print new lines Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.dcl Modified: commons/sandbox/exec/trunk/src/test/scripts/forever.dcl URL: http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/test/scripts/forever.dcl?rev=646914r1=646913r2=646914view=diff == --- commons/sandbox/exec/trunk/src/test/scripts/forever.dcl (original) +++ commons/sandbox/exec/trunk/src/test/scripts/forever.dcl Thu Apr 10 11:22:00 2008 @@ -1 +1 @@ -$!! $! $! 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. $! $!! $! $! run an infinite loop so the script w ill never ever terminate $! $LOOP: $ WAIT 00:00:01 $ WRITE SYS$OUTPUT . ! this includes a new line ;-) $ GOTO LOOP \ No newline at end of file +$!! $! $! 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. $! $!! $! $! run an infinite loop so the script w ill never ever terminate $! $! Suppress timeout warning $ SET MESSAGE /NOFACILITY /NOIDENTIFICATION /NOSEVERITY /NOTEXT $! $LOOP: $ read /prompt=./time_out=1 sys$command dummy $ GOTO LOOP \ No newline at end of file
svn commit: r647000 - in /commons/proper/io/trunk/src: java/org/apache/commons/io/FileUtils.java test/org/apache/commons/io/FileUtilsTestCase.java
Author: niallp
Date: Thu Apr 10 16:06:38 2008
New Revision: 647000
URL: http://svn.apache.org/viewvc?rev=647000view=rev
Log:
IO-163 Change FileUtils.toURLs() to use File.toURI().toURL() rather than
File.toURL() - thanks to Alex Miller for the suggestion
Modified:
commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
Modified: commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java?rev=647000r1=646999r2=647000view=diff
==
--- commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java
(original)
+++ commons/proper/io/trunk/src/java/org/apache/commons/io/FileUtils.java Thu
Apr 10 16:06:38 2008
@@ -532,7 +532,7 @@
URL[] urls = new URL[files.length];
for (int i = 0; i urls.length; i++) {
-urls[i] = files[i].toURL();
+urls[i] = files[i].toURI().toURL();
}
return urls;
Modified:
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java?rev=647000r1=646999r2=647000view=diff
==
---
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/org/apache/commons/io/FileUtilsTestCase.java
Thu Apr 10 16:06:38 2008
@@ -328,6 +328,7 @@
File[] files = new File[] {
new File(getTestDirectory(), file1.txt),
new File(getTestDirectory(), file2.txt),
+new File(getTestDirectory(), test file.txt),
};
URL[] urls = FileUtils.toURLs(files);
@@ -336,6 +337,10 @@
assertEquals(true, urls[0].toExternalForm().indexOf(file1.txt) = 0);
assertEquals(true, urls[1].toExternalForm().startsWith(file:));
assertEquals(true, urls[1].toExternalForm().indexOf(file2.txt) = 0);
+
+// Test escaped char
+assertEquals(true, urls[2].toExternalForm().startsWith(file:));
+assertEquals(true, urls[2].toExternalForm().indexOf(test%20file.txt)
= 0);
}
//public void testToURLs2() throws Exception {
svn commit: r647006 - /commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
Author: sebb
Date: Thu Apr 10 16:24:47 2008
New Revision: 647006
URL: http://svn.apache.org/viewvc?rev=647006view=rev
Log:
Make sure last line is terminated
Modified:
commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
Modified:
commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java?rev=647006r1=647005r2=647006view=diff
==
---
commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
(original)
+++
commons/sandbox/exec/trunk/src/main/java/org/apache/commons/exec/launcher/VmsCommandLauncher.java
Thu Apr 10 16:24:47 2008
@@ -95,6 +95,7 @@
out.println( -);
out.print(args[i]);
}
+out.println();
} finally {
if (out != null) {
out.close();
svn commit: r647045 - /commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
Author: bayard
Date: Thu Apr 10 21:16:07 2008
New Revision: 647045
URL: http://svn.apache.org/viewvc?rev=647045view=rev
Log:
Fixing eol style as per sebb's email
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
(contents, props changed)
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=647045r1=647044r2=647045view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
Thu Apr 10 21:16:07 2008
@@ -1,356 +1,356 @@
-/*
- * 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.
- */
-package org.apache.commons.collections.map;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.apache.commons.collections.IteratorUtils;
-import org.apache.commons.collections.MultiMap;
-
-/**
- * TestMultiValueMap.
- *
- * @author a href=mailto:[EMAIL PROTECTED]James Carman/a
- * @author Stephen Colebourne
- * @since Commons Collections 3.2
- */
-public class TestMultiValueMap extends TestCase {
-
-public TestMultiValueMap(String testName) {
-super(testName);
-}
-
-public static Test suite() {
-return new TestSuite(TestMultiValueMap.class);
-}
-
-public static void main(String args[]) {
-String[] testCaseName = { TestMultiValueMap.class.getName()};
-junit.textui.TestRunner.main(testCaseName);
-}
-
-public void testNoMappingReturnsNull() {
-final MultiValueMap map = createTestMap();
-assertNull(map.get(whatever));
-}
-
-public void testValueCollectionType() {
-final MultiValueMap map = createTestMap(LinkedList.class);
-assertTrue(map.get(one) instanceof LinkedList);
-}
-
-public void testMultipleValues() {
-final MultiValueMap map = createTestMap(HashSet.class);
-final HashSet expected = new HashSet();
-expected.add(uno);
-expected.add(un);
-assertEquals(expected, map.get(one));
-}
-
-public void testContainsValue() {
-final MultiValueMap map = createTestMap(HashSet.class);
-assertTrue(map.containsValue(uno));
-assertTrue(map.containsValue(un));
-assertTrue(map.containsValue(dos));
-assertTrue(map.containsValue(deux));
-assertTrue(map.containsValue(tres));
-assertTrue(map.containsValue(trois));
-assertFalse(map.containsValue(quatro));
-}
-
-public void testKeyContainsValue() {
-final MultiValueMap map = createTestMap(HashSet.class);
-assertTrue(map.containsValue(one, uno));
-assertTrue(map.containsValue(one, un));
-assertTrue(map.containsValue(two, dos));
-assertTrue(map.containsValue(two, deux));
-assertTrue(map.containsValue(three, tres));
-assertTrue(map.containsValue(three, trois));
-assertFalse(map.containsValue(four, quatro));
-}
-
-public void testValues() {
-final MultiValueMap map = createTestMap(HashSet.class);
-final HashSet expected = new HashSet();
-expected.add(uno);
-expected.add(dos);
-expected.add(tres);
-expected.add(un);
-expected.add(deux);
-expected.add(trois);
-final Collection c = map.values();
-assertEquals(6, c.size());
-assertEquals(expected, new HashSet(c));
-}
-
-private MultiValueMap createTestMap() {
-return createTestMap(ArrayList.class);
-}
-
-private MultiValueMap createTestMap(Class collectionClass) {
-final MultiValueMap map = MultiValueMap.decorate(new
